From c477e293978806804b02b24cae72328c91273779 Mon Sep 17 00:00:00 2001
From: Filip Sekulic <filip.sekulic@consensys.net>
Date: Tue, 14 Mar 2023 18:29:31 +0100
Subject: [PATCH 001/129] Fixed hardware wallet info popup on token allowance
 screen (#17881)

---
 ui/pages/token-allowance/token-allowance.js   |  8 ++++
 .../token-allowance/token-allowance.test.js   | 46 ++++++++++++++++---
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/ui/pages/token-allowance/token-allowance.js b/ui/pages/token-allowance/token-allowance.js
index d96599493..5aed6bde7 100644
--- a/ui/pages/token-allowance/token-allowance.js
+++ b/ui/pages/token-allowance/token-allowance.js
@@ -35,6 +35,7 @@ import {
   getUnapprovedTxCount,
   getUnapprovedTransactions,
   getUseCurrencyRateCheck,
+  isHardwareWallet,
 } from '../../selectors';
 import { NETWORK_TO_NAME_MAP } from '../../../shared/constants/network';
 import {
@@ -62,6 +63,7 @@ import { ConfirmPageContainerNavigation } from '../../components/app/confirm-pag
 import { useSimulationFailureWarning } from '../../hooks/useSimulationFailureWarning';
 import SimulationErrorMessage from '../../components/ui/simulation-error-message';
 import { Icon, ICON_NAMES } from '../../components/component-library';
+import LedgerInstructionField from '../../components/app/ledger-instruction-field/ledger-instruction-field';
 
 export default function TokenAllowance({
   origin,
@@ -111,6 +113,7 @@ export default function TokenAllowance({
   const unapprovedTxCount = useSelector(getUnapprovedTxCount);
   const unapprovedTxs = useSelector(getUnapprovedTransactions);
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
+  const isHardwareWalletConnected = useSelector(isHardwareWallet);
 
   const replaceCommaToDot = (inputValue) => {
     return inputValue.replace(/,/gu, '.');
@@ -491,6 +494,11 @@ export default function TokenAllowance({
           </Box>
         </Box>
       ) : null}
+      {!isFirstPage && isHardwareWalletConnected && (
+        <Box paddingLeft={2} paddingRight={2}>
+          <LedgerInstructionField showDataInstruction />
+        </Box>
+      )}
       <PageContainerFooter
         cancelText={t('reject')}
         submitText={isFirstPage ? t('next') : t('approveButtonText')}
diff --git a/ui/pages/token-allowance/token-allowance.test.js b/ui/pages/token-allowance/token-allowance.test.js
index b541e7aaa..1601d76a7 100644
--- a/ui/pages/token-allowance/token-allowance.test.js
+++ b/ui/pages/token-allowance/token-allowance.test.js
@@ -2,6 +2,7 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { fireEvent } from '@testing-library/react';
 import { renderWithProvider } from '../../../test/lib/render-helpers';
+import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
 import TokenAllowance from './token-allowance';
 
 const testTokenAddress = '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F';
@@ -11,17 +12,17 @@ const state = {
   },
   metamask: {
     accounts: {
-      '0xAddress': {
-        address: '0xAddress',
-        balance: '0x1F4',
+      '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+        address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+        balance: '0x0',
       },
     },
     gasEstimateType: 'none',
-    selectedAddress: '0xAddress',
+    selectedAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
     identities: {
-      '0xAddress': {
+      '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+        address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
         name: 'Account 1',
-        address: '0xAddress',
       },
     },
     cachedBalances: {},
@@ -64,6 +65,13 @@ const state = {
       },
     ],
     unapprovedTxs: {},
+    keyringTypes: [HardwareKeyringTypes.ledger],
+    keyrings: [
+      {
+        type: HardwareKeyringTypes.ledger,
+        accounts: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
+      },
+    ],
   },
   history: {
     mostRecentOverviewPage: '/',
@@ -244,4 +252,30 @@ describe('TokenAllowancePage', () => {
     fireEvent.click(gotIt);
     expect(gotIt).not.toBeInTheDocument();
   });
+
+  it('should show hardware wallet info text', () => {
+    const { queryByText, getByText, getByTestId } = renderWithProvider(
+      <TokenAllowance {...props} />,
+      store,
+    );
+
+    const textField = getByTestId('custom-spending-cap-input');
+    fireEvent.change(textField, { target: { value: '1' } });
+
+    expect(queryByText('Prior to clicking confirm:')).toBeNull();
+
+    const nextButton = getByText('Next');
+    fireEvent.click(nextButton);
+
+    expect(queryByText('Prior to clicking confirm:')).toBeInTheDocument();
+  });
+
+  it('should not show hardware wallet info text', () => {
+    const { queryByText } = renderWithProvider(
+      <TokenAllowance {...props} />,
+      store,
+    );
+
+    expect(queryByText('Prior to clicking confirm:')).toBeNull();
+  });
 });

From 5468c2c14219420eba4643df577d8f6be0d11847 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Tue, 14 Mar 2023 11:31:19 -0700
Subject: [PATCH 002/129] Fix disabled 'eth_sign' event & add 'Request
 Disabled' event type (#18007)

* Fix #17974 / add REQUEST_DISABLED event

* RPCMiddleware: add eth_sign REQUEST_DISABLED test

* don't call Signature Request for disabled eth_sign

* clean: alphabetize

* clean: rn isDisabledRequest -> isDisabledRPCMethod

* fix test

* rpc middeware: add eth_sign comment

* fix eth_sign events and re-add Signature Request

* send 'Signature Failed' for disabled eth_sigh
---
 .../lib/createRPCMethodTrackingMiddleware.js  | 25 ++++++++++++----
 .../createRPCMethodTrackingMiddleware.test.js | 30 +++++++++++++++++++
 shared/constants/metametrics.js               |  1 +
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
index 9073a26c3..e1376ae1e 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -1,3 +1,4 @@
+import { errorCodes } from 'eth-rpc-errors';
 import { MESSAGE_TYPE, ORIGIN_METAMASK } from '../../../shared/constants/app';
 import { SECOND } from '../../../shared/constants/time';
 import { detectSIWE } from '../../../shared/modules/siwe';
@@ -46,6 +47,7 @@ const RATE_LIMIT_MAP = {
 const EVENT_NAME_MAP = {
   [MESSAGE_TYPE.ETH_SIGN]: {
     APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
+    FAILED: EVENT_NAMES.SIGNATURE_FAILED,
     REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
     REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
   },
@@ -195,13 +197,25 @@ export default function createRPCMethodTrackingMiddleware({
         return callback();
       }
 
-      // An error code of 4001 means the user rejected the request, which we
-      // can use here to determine which event to track.
-      const event =
-        res.error?.code === 4001 ? eventType.REJECTED : eventType.APPROVED;
-
       const properties = {};
 
+      // The rpc error methodNotFound implies that 'eth_sign' is disabled in Advanced Settings
+      const isDisabledEthSignAdvancedSetting =
+        method === MESSAGE_TYPE.ETH_SIGN &&
+        res.error?.code === errorCodes.rpc.methodNotFound;
+
+      const isDisabledRPCMethod = isDisabledEthSignAdvancedSetting;
+
+      let event;
+      if (isDisabledRPCMethod) {
+        event = eventType.FAILED;
+        properties.error = res.error;
+      } else if (res.error?.code === 4001) {
+        event = eventType.REJECTED;
+      } else {
+        event = eventType.APPROVED;
+      }
+
       if (eventType.REQUESTED === EVENT_NAMES.SIGNATURE_REQUESTED) {
         properties.signature_type = method;
       } else {
@@ -226,6 +240,7 @@ export default function createRPCMethodTrackingMiddleware({
         },
         properties,
       });
+
       return callback();
     });
   };
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
index ffa953fa0..9a9f72157 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
@@ -1,3 +1,4 @@
+import { errorCodes } from 'eth-rpc-errors';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
 import { EVENT_NAMES } from '../../../shared/constants/metametrics';
 import { SECOND } from '../../../shared/constants/time';
@@ -213,5 +214,34 @@ describe('createRPCMethodTrackingMiddleware', () => {
       expect(trackEvent.mock.calls[0][0].properties.method).toBe('eth_chainId');
       expect(trackEvent.mock.calls[1][0].properties.method).toBe('eth_chainId');
     });
+
+    describe(`when '${MESSAGE_TYPE.ETH_SIGN}' is disabled in advanced settings`, () => {
+      it(`should track ${EVENT_NAMES.SIGNATURE_FAILED} and include error property`, async () => {
+        const mockError = { code: errorCodes.rpc.methodNotFound };
+        const req = {
+          method: MESSAGE_TYPE.ETH_SIGN,
+          origin: 'some.dapp',
+        };
+        const res = {
+          error: mockError,
+        };
+        const { next, executeMiddlewareStack } = getNext();
+
+        handler(req, res, next);
+        await executeMiddlewareStack();
+
+        expect(trackEvent).toHaveBeenCalledTimes(2);
+
+        expect(trackEvent.mock.calls[1][0]).toMatchObject({
+          category: 'inpage_provider',
+          event: EVENT_NAMES.SIGNATURE_FAILED,
+          properties: {
+            signature_type: MESSAGE_TYPE.ETH_SIGN,
+            error: mockError,
+          },
+          referrer: { url: 'some.dapp' },
+        });
+      });
+    });
   });
 });
diff --git a/shared/constants/metametrics.js b/shared/constants/metametrics.js
index 4471457a4..853807ce5 100644
--- a/shared/constants/metametrics.js
+++ b/shared/constants/metametrics.js
@@ -342,6 +342,7 @@ export const EVENT_NAMES = {
   PUBLIC_ADDRESS_COPIED: 'Public Address Copied',
   PROVIDER_METHOD_CALLED: 'Provider Method Called',
   SIGNATURE_APPROVED: 'Signature Approved',
+  SIGNATURE_FAILED: 'Signature Failed',
   SIGNATURE_REJECTED: 'Signature Rejected',
   SIGNATURE_REQUESTED: 'Signature Requested',
   TOKEN_IMPORT_BUTTON_CLICKED: 'Import Token Button Clicked',

From 7fc617f1bd1c1a9424b0a6c6882bed6ddaa35ade Mon Sep 17 00:00:00 2001
From: Peter <53189696+PeterYinusa@users.noreply.github.com>
Date: Wed, 15 Mar 2023 14:38:34 +0000
Subject: [PATCH 003/129] [skip e2e] bump coverage (#18165)

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

diff --git a/coverage-targets.js b/coverage-targets.js
index 8bd0ef280..d85aa5021 100644
--- a/coverage-targets.js
+++ b/coverage-targets.js
@@ -6,10 +6,10 @@
 // subset of files to check against these targets.
 module.exports = {
   global: {
-    lines: 64.5,
-    branches: 53.15,
-    statements: 63.57,
-    functions: 56.58,
+    lines: 65,
+    branches: 53.5,
+    statements: 64,
+    functions: 57.5,
   },
   transforms: {
     branches: 100,

From bd23a490133693a464c2f4ab1976181378a9f7bf Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 15 Mar 2023 12:16:31 -0230
Subject: [PATCH 004/129] Revert "Moved subscribe and filter into network
 controller (#16693)" (#18129)

* Revert "Moved subscribe and filter into network controller (#16693)"

This reverts commit 6f6984fa58c4797e809387b3b3d0b28e72b252bf. That
commit was an RPC middleware refactor intended to move the subscribe
and filter middleware into the network controller, to simplify the
process of sharing this middleware between clients.

This refactor resulted in `eth_subscribe` notifications being sent on
the wrong connections, causing the UI to break in some cases (the UI
`provider` connection does not support notifications). This happened
because the `setupProviderEngine` function runs per-connection,
whereas the engine setup inside the network controller is global. The
global network client cannot support notifications because it has no
way to route them; they'll need to stay in the per-connection provider
engine.

Closes #17467

* Add e2e test

An e2e test has been added that confirms subscriptions are only
broadcast to the site that registered them. This test fails on
`develop`.
---
 .../controllers/network/network-controller.js | 24 +-----
 .../controllers/permissions/specifications.js |  2 -
 app/scripts/metamask-controller.js            | 25 +++---
 test/e2e/tests/eth-subscribe.spec.js          | 78 +++++++++++++++++++
 4 files changed, 95 insertions(+), 34 deletions(-)
 create mode 100644 test/e2e/tests/eth-subscribe.spec.js

diff --git a/app/scripts/controllers/network/network-controller.js b/app/scripts/controllers/network/network-controller.js
index 6cf66f5dd..6f0e08cbe 100644
--- a/app/scripts/controllers/network/network-controller.js
+++ b/app/scripts/controllers/network/network-controller.js
@@ -2,18 +2,13 @@ import { strict as assert } from 'assert';
 import EventEmitter from 'events';
 import { ComposedStore, ObservableStore } from '@metamask/obs-store';
 import { JsonRpcEngine } from 'json-rpc-engine';
-import {
-  providerFromEngine,
-  providerFromMiddleware,
-} from '@metamask/eth-json-rpc-middleware';
+import { providerFromEngine } from '@metamask/eth-json-rpc-middleware';
 import log from 'loglevel';
 import {
   createSwappableProxy,
   createEventEmitterProxy,
 } from 'swappable-obj-proxy';
 import EthQuery from 'eth-query';
-import createFilterMiddleware from 'eth-json-rpc-filters';
-import createSubscriptionManager from 'eth-json-rpc-filters/subscriptionManager';
 import { v4 as random } from 'uuid';
 import {
   INFURA_PROVIDER_TYPES,
@@ -460,26 +455,9 @@ export default class NetworkController extends EventEmitter {
   }
 
   _setNetworkClient({ networkMiddleware, blockTracker }) {
-    const networkProvider = providerFromMiddleware(networkMiddleware);
-    const filterMiddleware = createFilterMiddleware({
-      provider: networkProvider,
-      blockTracker,
-    });
-    const subscriptionManager = createSubscriptionManager({
-      provider: networkProvider,
-      blockTracker,
-    });
-
     const engine = new JsonRpcEngine();
-    subscriptionManager.events.on('notification', (message) =>
-      engine.emit('notification', message),
-    );
-    engine.push(filterMiddleware);
-    engine.push(subscriptionManager.middleware);
     engine.push(networkMiddleware);
-
     const provider = providerFromEngine(engine);
-
     this._setProviderAndBlockTracker({ provider, blockTracker });
   }
 
diff --git a/app/scripts/controllers/permissions/specifications.js b/app/scripts/controllers/permissions/specifications.js
index 3779a904a..4072398d1 100644
--- a/app/scripts/controllers/permissions/specifications.js
+++ b/app/scripts/controllers/permissions/specifications.js
@@ -260,12 +260,10 @@ export const unrestrictedMethods = Object.freeze([
   'eth_signTypedData_v1',
   'eth_signTypedData_v3',
   'eth_signTypedData_v4',
-  'eth_subscribe',
   'eth_submitHashrate',
   'eth_submitWork',
   'eth_syncing',
   'eth_uninstallFilter',
-  'eth_unsubscribe',
   'metamask_getProviderState',
   'metamask_watchAsset',
   'net_listening',
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 9c496fd8b..61f52a635 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -10,6 +10,8 @@ import {
   KeyringController,
   keyringBuilderFactory,
 } from '@metamask/eth-keyring-controller';
+import createFilterMiddleware from 'eth-json-rpc-filters';
+import createSubscriptionManager from 'eth-json-rpc-filters/subscriptionManager';
 import {
   errorCodes as rpcErrorCodes,
   EthereumRpcError,
@@ -3898,19 +3900,21 @@ export default class MetamaskController extends EventEmitter {
    * @param {tabId} [options.tabId] - The tab ID of the sender - if the sender is within a tab
    */
   setupProviderEngine({ origin, subjectType, sender, tabId }) {
-    const { provider } = this;
-
     // setup json rpc engine stack
     const engine = new JsonRpcEngine();
+    const { blockTracker, provider } = this;
 
-    // forward notifications from network provider
-    provider.on('data', (error, message) => {
-      if (error) {
-        // This should never happen, this error parameter is never set
-        throw error;
-      }
-      engine.emit('notification', message);
+    // create filter polyfill middleware
+    const filterMiddleware = createFilterMiddleware({ provider, blockTracker });
+
+    // create subscription polyfill middleware
+    const subscriptionManager = createSubscriptionManager({
+      provider,
+      blockTracker,
     });
+    subscriptionManager.events.on('notification', (message) =>
+      engine.emit('notification', message),
+    );
 
     if (isManifestV3) {
       engine.push(createDupeReqFilterMiddleware());
@@ -4063,6 +4067,9 @@ export default class MetamaskController extends EventEmitter {
     );
     ///: END:ONLY_INCLUDE_IN
 
+    // filter and subscription polyfills
+    engine.push(filterMiddleware);
+    engine.push(subscriptionManager.middleware);
     if (subjectType !== SubjectType.Internal) {
       // permissions
       engine.push(
diff --git a/test/e2e/tests/eth-subscribe.spec.js b/test/e2e/tests/eth-subscribe.spec.js
new file mode 100644
index 000000000..d77135164
--- /dev/null
+++ b/test/e2e/tests/eth-subscribe.spec.js
@@ -0,0 +1,78 @@
+const { convertToHexValue, withFixtures } = require('../helpers');
+const FixtureBuilder = require('../fixture-builder');
+
+describe('eth_subscribe', function () {
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+  };
+
+  it('only broadcasts subscription notifications on the page that registered the subscription', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        ganacheOptions,
+        dappOptions: { numberOfDapps: 2 },
+        title: this.test.title,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        await driver.openNewPage('http://127.0.0.1:8080/');
+
+        const setupSubscriptionListener = `
+          const responseContainer = document.createElement('div');
+          responseContainer.setAttribute('id', 'eth-subscribe-responses');
+
+          const body = window.document.getElementsByTagName('body')[0];
+          body.appendChild(responseContainer);
+
+          window.ethereum.addListener('message', (message) => {
+            if (message.type === 'eth_subscription') {
+              const response = document.createElement('p');
+              response.setAttribute('data-testid', 'eth-subscribe-response');
+              response.append(JSON.stringify(message.data.result));
+
+              const responses = window.document.getElementById('eth-subscribe-responses');
+              responses.appendChild(response)
+            }
+          });
+        `;
+
+        await driver.executeScript(setupSubscriptionListener);
+        // A `newHeads` subscription will emit a notification for each new block
+        // See here for more information: https://docs.infura.io/infura/networks/ethereum/json-rpc-methods/subscription-methods/eth_subscribe
+        await driver.executeScript(`
+          window.ethereum.request({
+            method: 'eth_subscribe',
+            params: ['newHeads']
+          });
+        `);
+
+        // Verify that the new block is seen on the first dapp
+        await driver.findElement('[data-testid="eth-subscribe-response"]');
+
+        // Switch to the second dapp
+        await driver.openNewPage('http://127.0.0.1:8081/');
+
+        // Setup the same subscription listener as on the first dapp, but without registering a new subscription
+        await driver.executeScript(setupSubscriptionListener);
+
+        // Verify that the new block is not seen on the second dapp
+        await driver.assertElementNotPresent(
+          '[data-testid="eth-subscribe-response"]',
+        );
+      },
+    );
+  });
+});

From 7a421e05c37658820298ded50c8949df16fc1f3f Mon Sep 17 00:00:00 2001
From: Bowen Sanders <bowensanders@gmail.com>
Date: Wed, 15 Mar 2023 10:03:01 -0700
Subject: [PATCH 005/129] [FLASK] Snaps e2e test stability improvements
 (#18090)

* waitForSelector and pasteIntoField used now
---
 test/e2e/snaps/test-snap-bip-32.spec.js       | 14 ++++++++------
 test/e2e/snaps/test-snap-bip-44.spec.js       | 16 +++++++++-------
 test/e2e/snaps/test-snap-cronjob.spec.js      | 10 ++++++----
 test/e2e/snaps/test-snap-dialog.spec.js       | 12 +++++++-----
 test/e2e/snaps/test-snap-error.spec.js        | 11 ++++++-----
 test/e2e/snaps/test-snap-installed.spec.js    | 19 ++++++++++++-------
 test/e2e/snaps/test-snap-managestate.spec.js  | 13 ++++++++-----
 test/e2e/snaps/test-snap-notification.spec.js | 12 +++++++-----
 test/e2e/snaps/test-snap-rpc.spec.js          |  1 -
 test/e2e/snaps/test-snap-update.spec.js       | 11 ++++++-----
 10 files changed, 69 insertions(+), 50 deletions(-)

diff --git a/test/e2e/snaps/test-snap-bip-32.spec.js b/test/e2e/snaps/test-snap-bip-32.spec.js
index 2b05c8c4a..e69cdce34 100644
--- a/test/e2e/snaps/test-snap-bip-32.spec.js
+++ b/test/e2e/snaps/test-snap-bip-32.spec.js
@@ -77,13 +77,15 @@ describe('Test Snap bip-32', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         // switch back to test-snaps window
-        windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectBip32',
+          text: 'Reconnect to BIP-32 Snap',
+        });
+
         // scroll to and click get public key
         await driver.delay(1000);
         const snapButton2 = await driver.findElement('#bip32GetPublic');
@@ -122,7 +124,7 @@ describe('Test Snap bip-32', function () {
 
         // wait then run SECP256K1 test
         await driver.delay(1000);
-        await driver.fill('#bip32Message-secp256k1', 'foo bar');
+        await driver.pasteIntoField('#bip32Message-secp256k1', 'foo bar');
         await driver.clickElement('#sendBip32-secp256k1');
 
         // hit 'approve' on the custom confirm
@@ -157,7 +159,7 @@ describe('Test Snap bip-32', function () {
 
         // wait then run ed25519 test
         await driver.delay(1000);
-        await driver.fill('#bip32Message-ed25519', 'foo bar');
+        await driver.pasteIntoField('#bip32Message-ed25519', 'foo bar');
         await driver.clickElement('#sendBip32-ed25519');
 
         // hit 'approve' on the custom confirm
diff --git a/test/e2e/snaps/test-snap-bip-44.spec.js b/test/e2e/snaps/test-snap-bip-44.spec.js
index 54cd9b142..ad12ac0ac 100644
--- a/test/e2e/snaps/test-snap-bip-44.spec.js
+++ b/test/e2e/snaps/test-snap-bip-44.spec.js
@@ -70,19 +70,21 @@ describe('Test Snap bip-44', function () {
         // deal with permissions popover
         await driver.delay(1000);
         await driver.clickElement('#key-access-bip44-1-0');
-        await driver.delay(1000);
+        await driver.delay(1500);
         await driver.clickElement({
           text: 'Confirm',
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         // click send inputs on test snap page
-        windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.delay(1000);
+
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectBip44Snap',
+          text: 'Reconnect to BIP-44 Snap',
+        });
+
         await driver.clickElement('#sendBip44Test');
 
         // check the results of the public key test
@@ -94,7 +96,7 @@ describe('Test Snap bip-44', function () {
         );
 
         // enter a message to sign
-        await driver.fill('#bip44Message', '1234');
+        await driver.pasteIntoField('#bip44Message', '1234');
         await driver.delay(1000);
         const snapButton3 = await driver.findElement('#signBip44Message');
         await driver.scrollToElement(snapButton3);
diff --git a/test/e2e/snaps/test-snap-cronjob.spec.js b/test/e2e/snaps/test-snap-cronjob.spec.js
index 5818c1d37..d94d692ba 100644
--- a/test/e2e/snaps/test-snap-cronjob.spec.js
+++ b/test/e2e/snaps/test-snap-cronjob.spec.js
@@ -65,13 +65,15 @@ describe('Test Snap Cronjob', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         // click send inputs on test snap page
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectCronjobSnap',
+          text: 'Reconnect to Cronjob Snap',
+        });
+
         // switch to dialog popup, wait for a maximum of 65 seconds
         windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 65000);
         await driver.switchToWindowWithTitle(
diff --git a/test/e2e/snaps/test-snap-dialog.spec.js b/test/e2e/snaps/test-snap-dialog.spec.js
index f910a6b3b..4ca53ae22 100644
--- a/test/e2e/snaps/test-snap-dialog.spec.js
+++ b/test/e2e/snaps/test-snap-dialog.spec.js
@@ -65,13 +65,15 @@ describe('Test Snap Dialog', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         // switch to test snaps tab
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectDialogSnap',
+          text: 'Reconnect to Dialog Snap',
+        });
+
         // click on alert dialog
         await driver.clickElement('#sendAlertButton');
         await driver.delay(1000);
@@ -199,7 +201,7 @@ describe('Test Snap Dialog', function () {
         await driver.delay(1000);
 
         // fill '2323' in form field
-        await driver.fill('.MuiInput-input', '2323');
+        await driver.pasteIntoField('.MuiInput-input', '2323');
 
         // click submit button
         await driver.clickElement({
diff --git a/test/e2e/snaps/test-snap-error.spec.js b/test/e2e/snaps/test-snap-error.spec.js
index 2efb31d89..2e72a9b92 100644
--- a/test/e2e/snaps/test-snap-error.spec.js
+++ b/test/e2e/snaps/test-snap-error.spec.js
@@ -66,13 +66,14 @@ describe('Test Snap Error', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         // click send inputs on test snap page
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.delay(1000);
+
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectErrorSnap',
+          text: 'Reconnect to Error Snap',
+        });
 
         // find and click on send error
         await driver.clickElement('#sendError');
diff --git a/test/e2e/snaps/test-snap-installed.spec.js b/test/e2e/snaps/test-snap-installed.spec.js
index 08cabb6ec..2645c9b00 100644
--- a/test/e2e/snaps/test-snap-installed.spec.js
+++ b/test/e2e/snaps/test-snap-installed.spec.js
@@ -65,13 +65,15 @@ describe('Test Snap Installed', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         // click send inputs on test snap page
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectDialogSnap',
+          text: 'Reconnect to Dialog Snap',
+        });
+
         const errorButton = await driver.findElement('#connectErrorSnap');
         await driver.scrollToElement(errorButton);
         await driver.delay(1000);
@@ -101,12 +103,15 @@ describe('Test Snap Installed', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectErrorSnap',
+          text: 'Reconnect to Error Snap',
+        });
+
         const result = await driver.findElement('#installedSnapsResult');
         await driver.scrollToElement(result);
         await driver.delay(1000);
diff --git a/test/e2e/snaps/test-snap-managestate.spec.js b/test/e2e/snaps/test-snap-managestate.spec.js
index 28892419d..bbf2d5bcf 100644
--- a/test/e2e/snaps/test-snap-managestate.spec.js
+++ b/test/e2e/snaps/test-snap-managestate.spec.js
@@ -67,14 +67,17 @@ describe('Test Snap manageState', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         // fill and click send inputs on test snap page
-        windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
+
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectManageState',
+          text: 'Reconnect to Manage State Snap',
+        });
+
         await driver.delay(1000);
-        await driver.fill('#dataManageState', '23');
+        await driver.pasteIntoField('#dataManageState', '23');
         const snapButton2 = await driver.findElement(
           '#retrieveManageStateResult',
         );
diff --git a/test/e2e/snaps/test-snap-notification.spec.js b/test/e2e/snaps/test-snap-notification.spec.js
index 81a4a1307..bf4ad409a 100644
--- a/test/e2e/snaps/test-snap-notification.spec.js
+++ b/test/e2e/snaps/test-snap-notification.spec.js
@@ -67,13 +67,15 @@ describe('Test Snap Notification', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         // click send inputs on test snap page
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.delay(1000);
+
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectNotification',
+          text: 'Reconnect to Notification Snap',
+        });
+
         await driver.clickElement('#sendInAppNotification');
 
         // switch back to the extension page
diff --git a/test/e2e/snaps/test-snap-rpc.spec.js b/test/e2e/snaps/test-snap-rpc.spec.js
index 19715ec36..3f1716c5b 100644
--- a/test/e2e/snaps/test-snap-rpc.spec.js
+++ b/test/e2e/snaps/test-snap-rpc.spec.js
@@ -66,7 +66,6 @@ describe('Test Snap RPC', function () {
         });
 
         // switch back to test snaps page
-        windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
         // wait for npm installation success
diff --git a/test/e2e/snaps/test-snap-update.spec.js b/test/e2e/snaps/test-snap-update.spec.js
index 1120f20b8..472b5a1de 100644
--- a/test/e2e/snaps/test-snap-update.spec.js
+++ b/test/e2e/snaps/test-snap-update.spec.js
@@ -75,13 +75,14 @@ describe('Test Snap update', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
-
         // navigate to test snap page
-        windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.delay(1000);
+
+        // wait for npm installation success
+        await driver.waitForSelector({
+          css: '#connectUpdate',
+          text: 'Reconnect to Update Snap',
+        });
 
         // find and scroll to the correct card and click first
         const snapButton2 = await driver.findElement('#connectUpdateNew');

From 1c613a455669983f871c03b42c29b337a05529cd Mon Sep 17 00:00:00 2001
From: Ayush <ayushjain201474@gmail.com>
Date: Thu, 16 Mar 2023 05:30:54 +0530
Subject: [PATCH 006/129] Part of #17670: Replace Typography with Text
 component (#17959)

* Updated confirm-page-container-summary.component.js

* Updated snap-insight.js

* Updated confirmation-warning-modal.js

* Updated create-new-vault.js

* Fixing import errors, linting errors and adding a story

* Updating storybook path

* Updating snapshot

---------

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
---
 ...onfirm-page-container-summary.component.js | 13 ++--
 .../confirm-page-container-summary.stories.js | 65 +++++++++++++++++++
 .../flask/snap-insight.js                     | 18 ++---
 .../confirmation-warning-modal.js             | 32 ++++-----
 .../app/create-new-vault/create-new-vault.js  |  4 +-
 .../confirm-transaction-base.test.js.snap     |  2 +-
 6 files changed, 101 insertions(+), 33 deletions(-)
 create mode 100644 ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.stories.js

diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
index d58fe0280..90f3dc162 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
@@ -14,8 +14,8 @@ import { getIpfsGateway } from '../../../../../selectors';
 import Identicon from '../../../../ui/identicon';
 import InfoTooltip from '../../../../ui/info-tooltip';
 import NicknamePopovers from '../../../modals/nickname-popovers';
-import Typography from '../../../../ui/typography';
-import { TypographyVariant } from '../../../../../helpers/constants/design-system';
+import { Text } from '../../../../component-library';
+import { TextVariant } from '../../../../../helpers/constants/design-system';
 import { ORIGIN_METAMASK } from '../../../../../../shared/constants/app';
 import SiteOrigin from '../../../../ui/site-origin';
 import { getAssetImageURL } from '../../../../../helpers/utils/util';
@@ -131,17 +131,18 @@ const ConfirmPageContainerSummary = (props) => {
         <div className="confirm-page-container-summary__title">
           {renderImage()}
           {!hideTitle ? (
-            <Typography
+            <Text
               className="confirm-page-container-summary__title-text"
               variant={
                 title && title.length < 10
-                  ? TypographyVariant.H1
-                  : TypographyVariant.H3
+                  ? TextVariant.displayMd
+                  : TextVariant.headingMd
               }
+              as={title && title.length < 10 ? 'h1' : 'h3'}
               title={title}
             >
               {titleComponent || title}
-            </Typography>
+            </Text>
           ) : null}
         </div>
         {hideSubtitle ? null : (
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.stories.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.stories.js
new file mode 100644
index 000000000..a25722088
--- /dev/null
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.stories.js
@@ -0,0 +1,65 @@
+import React from 'react';
+import ConfirmPageContainerSummary from '.';
+
+export default {
+  title:
+    'Components/App/ConfirmPageContainer/ConfirmPageContainerContent/ConfirmPageContainerSummary',
+  argTypes: {
+    action: {
+      control: 'text',
+    },
+    title: {
+      control: 'text',
+    },
+    image: {
+      control: 'text',
+    },
+    titleComponent: {
+      control: 'text',
+    },
+    subtitleComponent: {
+      control: 'text',
+    },
+    hideSubtitle: {
+      control: 'boolean',
+    },
+    className: {
+      control: 'text',
+    },
+    tokenAddress: {
+      control: 'text',
+    },
+    toAddress: {
+      control: 'text',
+    },
+    nonce: {
+      control: 'text',
+    },
+    origin: {
+      control: 'text',
+    },
+    hideTitle: {
+      control: 'boolean',
+    },
+    transactionType: {
+      control: 'text',
+    },
+  },
+  args: {
+    action: 'action',
+    title: 'title',
+    titleComponent: 'titleComponent',
+    subtitleComponent: 'subtitleComponent',
+    className: 'className',
+    tokenAddress: '0x2170ed0880ac9a755fd29b2688956bd959f933f8',
+    toAddress: '0x2170ed0880ac9a755fd29b2688956bd959f933f8',
+    nonce: 'nonce',
+    origin: 'origin',
+    hideTitle: 'hideTitle',
+    transactionType: 'transactionType',
+  },
+};
+
+export const DefaultStory = (args) => <ConfirmPageContainerSummary {...args} />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/confirm-page-container/flask/snap-insight.js b/ui/components/app/confirm-page-container/flask/snap-insight.js
index 14bc84c3b..3cfafd94d 100644
--- a/ui/components/app/confirm-page-container/flask/snap-insight.js
+++ b/ui/components/app/confirm-page-container/flask/snap-insight.js
@@ -2,14 +2,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import Preloader from '../../../ui/icon/preloader/preloader-icon.component';
-import Typography from '../../../ui/typography/typography';
+import { Text } from '../../../component-library';
 import {
   AlignItems,
   FLEX_DIRECTION,
   JustifyContent,
   TEXT_ALIGN,
   TextColor,
-  TypographyVariant,
+  TextVariant,
 } from '../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { useTransactionInsightSnap } from '../../../../hooks/flask/useTransactionInsightSnap';
@@ -54,12 +54,13 @@ export const SnapInsight = ({ transaction, origin, chainId, selectedSnap }) => {
           {data && Object.keys(data).length > 0 ? (
             <SnapUIRenderer snapId={selectedSnap.id} data={data} />
           ) : (
-            <Typography
+            <Text
               color={TextColor.textAlternative}
-              variant={TypographyVariant.H6}
+              variant={TextVariant.bodySm}
+              as="h6"
             >
               {t('snapsNoInsight')}
-            </Typography>
+            </Text>
           )}
         </Box>
       )}
@@ -87,13 +88,14 @@ export const SnapInsight = ({ transaction, origin, chainId, selectedSnap }) => {
       {loading && (
         <>
           <Preloader size={40} />
-          <Typography
+          <Text
             marginTop={3}
             color={TextColor.textAlternative}
-            variant={TypographyVariant.H6}
+            variant={TextVariant.bodySm}
+            as="h6"
           >
             {t('snapsInsightLoading')}
-          </Typography>
+          </Text>
         </>
       )}
     </Box>
diff --git a/ui/components/app/confirmation-warning-modal/confirmation-warning-modal.js b/ui/components/app/confirmation-warning-modal/confirmation-warning-modal.js
index ebdbd74bc..d17c03b16 100644
--- a/ui/components/app/confirmation-warning-modal/confirmation-warning-modal.js
+++ b/ui/components/app/confirmation-warning-modal/confirmation-warning-modal.js
@@ -5,17 +5,16 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import Popover from '../../ui/popover';
 import Box from '../../ui/box';
 import Button from '../../ui/button';
-import Typography from '../../ui/typography';
 import {
   DISPLAY,
   FLEX_DIRECTION,
   FONT_WEIGHT,
   JustifyContent,
-  TypographyVariant,
+  TextVariant,
   AlignItems,
   IconColor,
 } from '../../../helpers/constants/design-system';
-import { Icon, ICON_NAMES, ICON_SIZES } from '../../component-library';
+import { Text, Icon, ICON_NAMES, ICON_SIZES } from '../../component-library';
 
 const ConfirmationWarningModal = ({ onSubmit, onCancel }) => {
   const t = useI18nContext();
@@ -61,39 +60,40 @@ const ConfirmationWarningModal = ({ onSubmit, onCancel }) => {
           className="confirmation-warning-modal__content__header__warning-icon"
           size={ICON_SIZES.XL}
         />
-        <Typography
-          variant={TypographyVariant.H4}
+        <Text
+          variant={TextVariant.headingSm}
+          as="h4"
           fontWeight={FONT_WEIGHT.BOLD}
         >
           {t('addEthereumChainWarningModalTitle')}
-        </Typography>
+        </Text>
       </Box>
       <Box marginLeft={6} marginRight={6} marginTop={0} marginBottom={3}>
-        <Typography marginTop={4} variant={TypographyVariant.H6}>
+        <Text marginTop={4} variant={TextVariant.bodySm} as="h6">
           {t('addEthereumChainWarningModalHeader', [
             <strong key="part-2">
               {t('addEthereumChainWarningModalHeaderPartTwo')}
             </strong>,
           ])}
-        </Typography>
-        <Typography marginTop={4} variant={TypographyVariant.H6}>
+        </Text>
+        <Text marginTop={4} variant={TextVariant.bodySm} as="h6">
           {t('addEthereumChainWarningModalListHeader')}
-        </Typography>
+        </Text>
         <ul>
           <li>
-            <Typography marginTop={2} variant={TypographyVariant.H6}>
+            <Text marginTop={2} variant={TextVariant.bodySm} as="h6">
               {t('addEthereumChainWarningModalListPointOne')}
-            </Typography>
+            </Text>
           </li>
           <li>
-            <Typography marginTop={2} variant={TypographyVariant.H6}>
+            <Text marginTop={2} variant={TextVariant.bodySm} as="h6">
               {t('addEthereumChainWarningModalListPointTwo')}
-            </Typography>
+            </Text>
           </li>
           <li>
-            <Typography marginTop={2} variant={TypographyVariant.H6}>
+            <Text marginTop={2} variant={TextVariant.bodySm} as="h6">
               {t('addEthereumChainWarningModalListPointThree')}
-            </Typography>
+            </Text>
           </li>
         </ul>
       </Box>
diff --git a/ui/components/app/create-new-vault/create-new-vault.js b/ui/components/app/create-new-vault/create-new-vault.js
index b8ad32670..13b28eb0a 100644
--- a/ui/components/app/create-new-vault/create-new-vault.js
+++ b/ui/components/app/create-new-vault/create-new-vault.js
@@ -4,7 +4,7 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import TextField from '../../ui/text-field';
 import Button from '../../ui/button';
 import CheckBox from '../../ui/check-box';
-import Typography from '../../ui/typography';
+import { Text } from '../../component-library';
 import SrpInput from '../srp-input';
 import { PASSWORD_MIN_LENGTH } from '../../../helpers/constants/common';
 
@@ -135,7 +135,7 @@ export default function CreateNewVault({
             className="create-new-vault__terms-label"
             htmlFor="create-new-vault__terms-checkbox"
           >
-            <Typography as="span">{termsOfUse}</Typography>
+            <Text as="span">{termsOfUse}</Text>
           </label>
         </div>
       ) : null}
diff --git a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
index c6dba019d..46a976a57 100644
--- a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
+++ b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
@@ -254,7 +254,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
           class="confirm-page-container-summary__title"
         >
           <h3
-            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography confirm-page-container-summary__title-text typography--h3 typography--weight-normal typography--style-normal typography--color-text-default"
+            class="box mm-text confirm-page-container-summary__title-text mm-text--heading-md mm-text--color-text-default box--flex-direction-row"
           >
             <div
               class="currency-display-component"

From 1482cd1c961bb2befa6fcfabe40e713f5b63380b Mon Sep 17 00:00:00 2001
From: Davide Brocchetto <davibroc@yahoo.com>
Date: Thu, 16 Mar 2023 11:06:33 +0100
Subject: [PATCH 007/129] Fixed test instability (#18174)

---
 test/e2e/swaps/shared.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/swaps/shared.js b/test/e2e/swaps/shared.js
index f6cb920a5..ef7eb8278 100644
--- a/test/e2e/swaps/shared.js
+++ b/test/e2e/swaps/shared.js
@@ -83,7 +83,7 @@ const reviewQuote = async (driver, options) => {
     'Error: SwapFrom has wrong symbol',
   );
   const swapToSymbol = await driver.waitForSelector(
-    '.main-quote-summary__destination-row',
+    '.main-quote-summary__destination-row > span',
   );
   assert.equal(
     await swapToSymbol.getText(),

From 872a8c79f40fa2422f6228fd02f98fbebf0ccaa6 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Thu, 16 Mar 2023 11:33:40 +0100
Subject: [PATCH 008/129] Bump `@metamask/utils` to `5.0.0` (#18155)

* Update utils

* Ignore as-sha256

* Update LavaMoat policies
---
 development/build/scripts.js            |   3 +
 lavamoat/browserify/beta/policy.json    | 312 ++++++++++++--------
 lavamoat/browserify/desktop/policy.json | 370 ++++++++++++++++--------
 lavamoat/browserify/flask/policy.json   | 370 ++++++++++++++++--------
 lavamoat/browserify/main/policy.json    | 312 ++++++++++++--------
 package.json                            |   2 +-
 yarn.lock                               | 107 +++++--
 7 files changed, 986 insertions(+), 490 deletions(-)

diff --git a/development/build/scripts.js b/development/build/scripts.js
index 3bb01ef66..d28ef4db4 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -907,6 +907,9 @@ function setupBundlerDefaults(
     bundlerOpts.manualIgnore.push('remote-redux-devtools');
   }
 
+  // This dependency uses WASM which we cannot execute in accordance with our CSP
+  bundlerOpts.manualIgnore.push('@chainsafe/as-sha256');
+
   // Inject environment variables via node-style `process.env`
   if (envVars) {
     bundlerOpts.transform.push([envify(envVars), { global: true }]);
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 5cf58f0f3..98e2ef7d2 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -707,12 +707,12 @@
         "@ethersproject/providers": true,
         "@metamask/assets-controllers>@metamask/abi-utils": true,
         "@metamask/assets-controllers>@metamask/controller-utils": true,
+        "@metamask/assets-controllers>@metamask/utils": true,
         "@metamask/assets-controllers>abort-controller": true,
         "@metamask/assets-controllers>multiformats": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/utils": true,
         "browserify>events": true,
         "eth-json-rpc-filters>async-mutex": true,
         "eth-query": true,
@@ -724,10 +724,22 @@
     },
     "@metamask/assets-controllers>@metamask/abi-utils": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/assets-controllers>@metamask/abi-utils>@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
+    "@metamask/assets-controllers>@metamask/abi-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/assets-controllers>@metamask/controller-utils": {
       "globals": {
         "console.error": true,
@@ -743,6 +755,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/assets-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/assets-controllers>abort-controller": {
       "globals": {
         "AbortController": true
@@ -819,13 +843,25 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
-        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "node-fetch": true
       }
     },
+    "@metamask/eth-json-rpc-infura>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -853,17 +889,25 @@
     },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
       "packages": {
+        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -880,9 +924,9 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/utils": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -891,6 +935,18 @@
         "vinyl>clone": true
       }
     },
+    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/eth-keyring-controller": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
@@ -906,33 +962,17 @@
         "TextEncoder": true
       },
       "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
         "@metamask/scure-bip39": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>@ethereumjs/util": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>@metamask/eth-sig-util": {
       "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>@ethereumjs/util": true,
@@ -940,21 +980,6 @@
         "eth-sig-util>tweetnacl-util": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -965,28 +990,13 @@
     "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "browserify>events": true,
         "eth-lattice-keyring>@ethereumjs/util": true,
         "ethereumjs-wallet>randombytes": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>obs-store": {
       "packages": {
         "safe-event-emitter": true,
@@ -1022,17 +1032,25 @@
     },
     "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": {
       "packages": {
+        "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -1222,12 +1240,24 @@
     },
     "@metamask/key-tree": {
       "packages": {
+        "@metamask/key-tree>@metamask/utils": true,
         "@metamask/key-tree>@noble/ed25519": true,
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@noble/secp256k1": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/scure-bip39": true,
-        "@metamask/utils": true
+        "@metamask/scure-bip39": true
+      }
+    },
+    "@metamask/key-tree>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/key-tree>@noble/ed25519": {
@@ -1362,7 +1392,7 @@
       "packages": {
         "@metamask/key-tree": true,
         "@metamask/key-tree>@noble/hashes": true,
-        "@metamask/utils": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
@@ -1380,6 +1410,18 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/rpc-methods>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1448,6 +1490,59 @@
         "semver": true
       }
     },
+    "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": {
+      "packages": {
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>case": true,
+        "browserify": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+      "globals": {
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
+      "packages": {
+        "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/key-tree>@scure/base": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true
+      }
+    },
     "@ngraveio/bc-ur": {
       "packages": {
         "@ngraveio/bc-ur>@apocentre/alias-sampling": true,
@@ -2595,12 +2690,24 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/utils": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-block-tracker>pify": true,
         "eth-query>json-rpc-random-id": true,
         "json-rpc-engine>@metamask/safe-event-emitter": true
       }
     },
+    "eth-block-tracker>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "eth-ens-namehash": {
       "globals": {
         "name": "write"
@@ -2682,61 +2789,12 @@
         "console.warn": true
       },
       "packages": {
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": true,
+        "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "browserify>events": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": true,
-        "eth-lattice-keyring>@ethereumjs/util>async": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>async": {
-      "globals": {
-        "clearTimeout": true,
-        "console": true,
-        "define": true,
-        "queueMicrotask": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>process": true,
-        "browserify>timers-browserify": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": {
-      "globals": {
-        "crypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": {
-      "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "@metamask/key-tree>@scure/base": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "eth-lattice-keyring>bn.js": {
@@ -2937,14 +2995,22 @@
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "eth-sig-util>ethereumjs-util>ethjs-util": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -3064,13 +3130,21 @@
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
+        "ethereumjs-abi>ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-abi>ethereumjs-util>ethjs-util": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "ethereumjs-abi>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "ethereumjs-abi>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -3255,14 +3329,22 @@
         "ethereumjs-wallet>safe-buffer": true
       }
     },
+    "ethereumjs-wallet>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "ethereumjs-wallet>ethereumjs-util": {
       "packages": {
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
+        "ethereumjs-wallet>ethereum-cryptography": true,
         "ethereumjs-wallet>ethereumjs-util>ethjs-util": true,
         "ganache>secp256k1>elliptic": true
       }
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 00325bca9..a84edb962 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -707,12 +707,12 @@
         "@ethersproject/providers": true,
         "@metamask/assets-controllers>@metamask/abi-utils": true,
         "@metamask/assets-controllers>@metamask/controller-utils": true,
+        "@metamask/assets-controllers>@metamask/utils": true,
         "@metamask/assets-controllers>abort-controller": true,
         "@metamask/assets-controllers>multiformats": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/utils": true,
         "browserify>events": true,
         "eth-json-rpc-filters>async-mutex": true,
         "eth-query": true,
@@ -724,10 +724,22 @@
     },
     "@metamask/assets-controllers>@metamask/abi-utils": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/assets-controllers>@metamask/abi-utils>@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
+    "@metamask/assets-controllers>@metamask/abi-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/assets-controllers>@metamask/controller-utils": {
       "globals": {
         "console.error": true,
@@ -743,6 +755,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/assets-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/assets-controllers>abort-controller": {
       "globals": {
         "AbortController": true
@@ -873,13 +897,25 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
-        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "node-fetch": true
       }
     },
+    "@metamask/eth-json-rpc-infura>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -907,17 +943,25 @@
     },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
       "packages": {
+        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -934,9 +978,9 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/utils": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -945,6 +989,18 @@
         "vinyl>clone": true
       }
     },
+    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/eth-keyring-controller": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
@@ -960,33 +1016,17 @@
         "TextEncoder": true
       },
       "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
         "@metamask/scure-bip39": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>@ethereumjs/util": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>@metamask/eth-sig-util": {
       "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>@ethereumjs/util": true,
@@ -994,21 +1034,6 @@
         "eth-sig-util>tweetnacl-util": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -1019,28 +1044,13 @@
     "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "browserify>events": true,
         "eth-lattice-keyring>@ethereumjs/util": true,
         "ethereumjs-wallet>randombytes": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>obs-store": {
       "packages": {
         "safe-event-emitter": true,
@@ -1076,17 +1086,25 @@
     },
     "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": {
       "packages": {
+        "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -1276,12 +1294,24 @@
     },
     "@metamask/key-tree": {
       "packages": {
+        "@metamask/key-tree>@metamask/utils": true,
         "@metamask/key-tree>@noble/ed25519": true,
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@noble/secp256k1": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/scure-bip39": true,
-        "@metamask/utils": true
+        "@metamask/scure-bip39": true
+      }
+    },
+    "@metamask/key-tree>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/key-tree>@noble/ed25519": {
@@ -1436,8 +1466,20 @@
         "removeEventListener": true
       },
       "packages": {
-        "@metamask/post-message-stream>readable-stream": true,
-        "@metamask/utils": true
+        "@metamask/post-message-stream>@metamask/utils": true,
+        "@metamask/post-message-stream>readable-stream": true
+      }
+    },
+    "@metamask/post-message-stream>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/post-message-stream>readable-stream": {
@@ -1500,10 +1542,10 @@
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/rpc-methods>@metamask/browser-passworder": true,
         "@metamask/rpc-methods>@metamask/permission-controller": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/rpc-methods>nanoid": true,
         "@metamask/snaps-ui": true,
         "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
         "@metamask/utils>superstruct": true,
         "eth-rpc-errors": true
       }
@@ -1552,6 +1594,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/rpc-methods>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1615,6 +1669,7 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@metamask/subject-metadata-controller": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>gunzip-maybe": true,
@@ -1622,7 +1677,6 @@
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "json-rpc-middleware-stream": true,
@@ -1664,6 +1718,18 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "@metamask/snaps-controllers>concat-stream>readable-stream": true,
@@ -1812,10 +1878,22 @@
     },
     "@metamask/snaps-ui": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/snaps-ui>@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
+    "@metamask/snaps-ui>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/snaps-utils": {
       "globals": {
         "TextDecoder": true,
@@ -1829,15 +1907,27 @@
       "packages": {
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@scure/base": true,
+        "@metamask/snaps-utils>@metamask/utils": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "@metamask/snaps-utils>rfdc": true,
         "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
         "@metamask/utils>superstruct": true,
         "semver": true
       }
     },
+    "@metamask/snaps-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/snaps-utils>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -1877,6 +1967,59 @@
         "semver": true
       }
     },
+    "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": {
+      "packages": {
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>case": true,
+        "browserify": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+      "globals": {
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
+      "packages": {
+        "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/key-tree>@scure/base": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true
+      }
+    },
     "@ngraveio/bc-ur": {
       "packages": {
         "@ngraveio/bc-ur>@apocentre/alias-sampling": true,
@@ -3024,12 +3167,24 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/utils": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-block-tracker>pify": true,
         "eth-query>json-rpc-random-id": true,
         "json-rpc-engine>@metamask/safe-event-emitter": true
       }
     },
+    "eth-block-tracker>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "eth-ens-namehash": {
       "globals": {
         "name": "write"
@@ -3111,61 +3266,12 @@
         "console.warn": true
       },
       "packages": {
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": true,
+        "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "browserify>events": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": true,
-        "eth-lattice-keyring>@ethereumjs/util>async": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>async": {
-      "globals": {
-        "clearTimeout": true,
-        "console": true,
-        "define": true,
-        "queueMicrotask": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>process": true,
-        "browserify>timers-browserify": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": {
-      "globals": {
-        "crypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": {
-      "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "@metamask/key-tree>@scure/base": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "eth-lattice-keyring>bn.js": {
@@ -3366,14 +3472,22 @@
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "eth-sig-util>ethereumjs-util>ethjs-util": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -3493,13 +3607,21 @@
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
+        "ethereumjs-abi>ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-abi>ethereumjs-util>ethjs-util": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "ethereumjs-abi>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "ethereumjs-abi>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -3684,14 +3806,22 @@
         "ethereumjs-wallet>safe-buffer": true
       }
     },
+    "ethereumjs-wallet>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "ethereumjs-wallet>ethereumjs-util": {
       "packages": {
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
+        "ethereumjs-wallet>ethereum-cryptography": true,
         "ethereumjs-wallet>ethereumjs-util>ethjs-util": true,
         "ganache>secp256k1>elliptic": true
       }
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 00325bca9..a84edb962 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -707,12 +707,12 @@
         "@ethersproject/providers": true,
         "@metamask/assets-controllers>@metamask/abi-utils": true,
         "@metamask/assets-controllers>@metamask/controller-utils": true,
+        "@metamask/assets-controllers>@metamask/utils": true,
         "@metamask/assets-controllers>abort-controller": true,
         "@metamask/assets-controllers>multiformats": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/utils": true,
         "browserify>events": true,
         "eth-json-rpc-filters>async-mutex": true,
         "eth-query": true,
@@ -724,10 +724,22 @@
     },
     "@metamask/assets-controllers>@metamask/abi-utils": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/assets-controllers>@metamask/abi-utils>@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
+    "@metamask/assets-controllers>@metamask/abi-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/assets-controllers>@metamask/controller-utils": {
       "globals": {
         "console.error": true,
@@ -743,6 +755,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/assets-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/assets-controllers>abort-controller": {
       "globals": {
         "AbortController": true
@@ -873,13 +897,25 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
-        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "node-fetch": true
       }
     },
+    "@metamask/eth-json-rpc-infura>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -907,17 +943,25 @@
     },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
       "packages": {
+        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -934,9 +978,9 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/utils": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -945,6 +989,18 @@
         "vinyl>clone": true
       }
     },
+    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/eth-keyring-controller": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
@@ -960,33 +1016,17 @@
         "TextEncoder": true
       },
       "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
         "@metamask/scure-bip39": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>@ethereumjs/util": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>@metamask/eth-sig-util": {
       "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>@ethereumjs/util": true,
@@ -994,21 +1034,6 @@
         "eth-sig-util>tweetnacl-util": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -1019,28 +1044,13 @@
     "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "browserify>events": true,
         "eth-lattice-keyring>@ethereumjs/util": true,
         "ethereumjs-wallet>randombytes": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>obs-store": {
       "packages": {
         "safe-event-emitter": true,
@@ -1076,17 +1086,25 @@
     },
     "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": {
       "packages": {
+        "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -1276,12 +1294,24 @@
     },
     "@metamask/key-tree": {
       "packages": {
+        "@metamask/key-tree>@metamask/utils": true,
         "@metamask/key-tree>@noble/ed25519": true,
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@noble/secp256k1": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/scure-bip39": true,
-        "@metamask/utils": true
+        "@metamask/scure-bip39": true
+      }
+    },
+    "@metamask/key-tree>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/key-tree>@noble/ed25519": {
@@ -1436,8 +1466,20 @@
         "removeEventListener": true
       },
       "packages": {
-        "@metamask/post-message-stream>readable-stream": true,
-        "@metamask/utils": true
+        "@metamask/post-message-stream>@metamask/utils": true,
+        "@metamask/post-message-stream>readable-stream": true
+      }
+    },
+    "@metamask/post-message-stream>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/post-message-stream>readable-stream": {
@@ -1500,10 +1542,10 @@
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/rpc-methods>@metamask/browser-passworder": true,
         "@metamask/rpc-methods>@metamask/permission-controller": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/rpc-methods>nanoid": true,
         "@metamask/snaps-ui": true,
         "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
         "@metamask/utils>superstruct": true,
         "eth-rpc-errors": true
       }
@@ -1552,6 +1594,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/rpc-methods>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1615,6 +1669,7 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@metamask/subject-metadata-controller": true,
+        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>gunzip-maybe": true,
@@ -1622,7 +1677,6 @@
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-utils": true,
-        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "json-rpc-middleware-stream": true,
@@ -1664,6 +1718,18 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "@metamask/snaps-controllers>concat-stream>readable-stream": true,
@@ -1812,10 +1878,22 @@
     },
     "@metamask/snaps-ui": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/snaps-ui>@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
+    "@metamask/snaps-ui>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/snaps-utils": {
       "globals": {
         "TextDecoder": true,
@@ -1829,15 +1907,27 @@
       "packages": {
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@scure/base": true,
+        "@metamask/snaps-utils>@metamask/utils": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "@metamask/snaps-utils>rfdc": true,
         "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
         "@metamask/utils>superstruct": true,
         "semver": true
       }
     },
+    "@metamask/snaps-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/snaps-utils>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -1877,6 +1967,59 @@
         "semver": true
       }
     },
+    "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": {
+      "packages": {
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>case": true,
+        "browserify": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+      "globals": {
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
+      "packages": {
+        "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/key-tree>@scure/base": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true
+      }
+    },
     "@ngraveio/bc-ur": {
       "packages": {
         "@ngraveio/bc-ur>@apocentre/alias-sampling": true,
@@ -3024,12 +3167,24 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/utils": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-block-tracker>pify": true,
         "eth-query>json-rpc-random-id": true,
         "json-rpc-engine>@metamask/safe-event-emitter": true
       }
     },
+    "eth-block-tracker>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "eth-ens-namehash": {
       "globals": {
         "name": "write"
@@ -3111,61 +3266,12 @@
         "console.warn": true
       },
       "packages": {
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": true,
+        "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "browserify>events": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": true,
-        "eth-lattice-keyring>@ethereumjs/util>async": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>async": {
-      "globals": {
-        "clearTimeout": true,
-        "console": true,
-        "define": true,
-        "queueMicrotask": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>process": true,
-        "browserify>timers-browserify": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": {
-      "globals": {
-        "crypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": {
-      "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "@metamask/key-tree>@scure/base": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "eth-lattice-keyring>bn.js": {
@@ -3366,14 +3472,22 @@
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "eth-sig-util>ethereumjs-util>ethjs-util": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -3493,13 +3607,21 @@
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
+        "ethereumjs-abi>ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-abi>ethereumjs-util>ethjs-util": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "ethereumjs-abi>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "ethereumjs-abi>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -3684,14 +3806,22 @@
         "ethereumjs-wallet>safe-buffer": true
       }
     },
+    "ethereumjs-wallet>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "ethereumjs-wallet>ethereumjs-util": {
       "packages": {
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
+        "ethereumjs-wallet>ethereum-cryptography": true,
         "ethereumjs-wallet>ethereumjs-util>ethjs-util": true,
         "ganache>secp256k1>elliptic": true
       }
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 5cf58f0f3..98e2ef7d2 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -707,12 +707,12 @@
         "@ethersproject/providers": true,
         "@metamask/assets-controllers>@metamask/abi-utils": true,
         "@metamask/assets-controllers>@metamask/controller-utils": true,
+        "@metamask/assets-controllers>@metamask/utils": true,
         "@metamask/assets-controllers>abort-controller": true,
         "@metamask/assets-controllers>multiformats": true,
         "@metamask/base-controller": true,
         "@metamask/contract-metadata": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/utils": true,
         "browserify>events": true,
         "eth-json-rpc-filters>async-mutex": true,
         "eth-query": true,
@@ -724,10 +724,22 @@
     },
     "@metamask/assets-controllers>@metamask/abi-utils": {
       "packages": {
-        "@metamask/utils": true,
+        "@metamask/assets-controllers>@metamask/abi-utils>@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
+    "@metamask/assets-controllers>@metamask/abi-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/assets-controllers>@metamask/controller-utils": {
       "globals": {
         "console.error": true,
@@ -743,6 +755,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/assets-controllers>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/assets-controllers>abort-controller": {
       "globals": {
         "AbortController": true
@@ -819,13 +843,25 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": true,
-        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "node-fetch": true
       }
     },
+    "@metamask/eth-json-rpc-infura>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -853,17 +889,25 @@
     },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
       "packages": {
+        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -880,9 +924,9 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/utils": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -891,6 +935,18 @@
         "vinyl>clone": true
       }
     },
+    "@metamask/eth-json-rpc-middleware>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/eth-keyring-controller": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
@@ -906,33 +962,17 @@
         "TextEncoder": true
       },
       "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
         "@metamask/scure-bip39": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>@ethereumjs/util": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>@metamask/eth-sig-util": {
       "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "bn.js": true,
         "browserify>buffer": true,
         "eth-lattice-keyring>@ethereumjs/util": true,
@@ -940,21 +980,6 @@
         "eth-sig-util>tweetnacl-util": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -965,28 +990,13 @@
     "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "browserify>events": true,
         "eth-lattice-keyring>@ethereumjs/util": true,
         "ethereumjs-wallet>randombytes": true
       }
     },
-    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": true
-      }
-    },
-    "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
     "@metamask/eth-keyring-controller>obs-store": {
       "packages": {
         "safe-event-emitter": true,
@@ -1022,17 +1032,25 @@
     },
     "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util": {
       "packages": {
+        "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": true,
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "@metamask/eth-ledger-bridge-keyring>eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -1222,12 +1240,24 @@
     },
     "@metamask/key-tree": {
       "packages": {
+        "@metamask/key-tree>@metamask/utils": true,
         "@metamask/key-tree>@noble/ed25519": true,
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@noble/secp256k1": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/scure-bip39": true,
-        "@metamask/utils": true
+        "@metamask/scure-bip39": true
+      }
+    },
+    "@metamask/key-tree>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
       }
     },
     "@metamask/key-tree>@noble/ed25519": {
@@ -1362,7 +1392,7 @@
       "packages": {
         "@metamask/key-tree": true,
         "@metamask/key-tree>@noble/hashes": true,
-        "@metamask/utils": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
@@ -1380,6 +1410,18 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/rpc-methods>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1448,6 +1490,59 @@
         "semver": true
       }
     },
+    "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": {
+      "packages": {
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true,
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>case": true,
+        "browserify": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": {
+      "globals": {
+        "WeakRef": true
+      },
+      "packages": {
+        "browserify": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": {
+      "globals": {
+        "TextEncoder": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": {
+      "globals": {
+        "TextDecoder": true,
+        "crypto": true
+      },
+      "packages": {
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": {
+      "globals": {
+        "TextEncoder": true,
+        "crypto": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": {
+      "packages": {
+        "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/key-tree>@scure/base": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true
+      }
+    },
     "@ngraveio/bc-ur": {
       "packages": {
         "@ngraveio/bc-ur>@apocentre/alias-sampling": true,
@@ -2595,12 +2690,24 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/utils": true,
+        "eth-block-tracker>@metamask/utils": true,
         "eth-block-tracker>pify": true,
         "eth-query>json-rpc-random-id": true,
         "json-rpc-engine>@metamask/safe-event-emitter": true
       }
     },
+    "eth-block-tracker>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "eth-ens-namehash": {
       "globals": {
         "name": "write"
@@ -2682,61 +2789,12 @@
         "console.warn": true
       },
       "packages": {
+        "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": true,
+        "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": true,
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true,
         "browserify>buffer": true,
         "browserify>events": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": true,
-        "eth-lattice-keyring>@ethereumjs/util>async": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>@ethereumjs/rlp": {
-      "globals": {
-        "TextEncoder": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>async": {
-      "globals": {
-        "clearTimeout": true,
-        "console": true,
-        "define": true,
-        "queueMicrotask": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>process": true,
-        "browserify>timers-browserify": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography": {
-      "globals": {
-        "TextDecoder": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/hashes": {
-      "globals": {
-        "TextEncoder": true,
-        "crypto": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": {
-      "globals": {
-        "crypto": true
-      },
-      "packages": {
-        "browserify>browser-resolve": true
-      }
-    },
-    "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@scure/bip32": {
-      "packages": {
-        "@metamask/key-tree>@noble/hashes": true,
-        "@metamask/key-tree>@scure/base": true,
-        "eth-lattice-keyring>@ethereumjs/util>ethereum-cryptography>@noble/secp256k1": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "eth-lattice-keyring>bn.js": {
@@ -2937,14 +2995,22 @@
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
+        "eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
         "eth-sig-util>ethereumjs-util>ethjs-util": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ethereumjs-wallet>safe-buffer": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "eth-sig-util>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "eth-sig-util>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -3064,13 +3130,21 @@
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
+        "ethereumjs-abi>ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-abi>ethereumjs-util>ethjs-util": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
         "ganache>secp256k1>elliptic": true
       }
     },
+    "ethereumjs-abi>ethereumjs-util>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "ethereumjs-abi>ethereumjs-util>ethjs-util": {
       "packages": {
         "browserify>buffer": true,
@@ -3255,14 +3329,22 @@
         "ethereumjs-wallet>safe-buffer": true
       }
     },
+    "ethereumjs-wallet>ethereum-cryptography": {
+      "packages": {
+        "browserify>buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
     "ethereumjs-wallet>ethereumjs-util": {
       "packages": {
         "bn.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-util>rlp": true,
+        "ethereumjs-wallet>ethereum-cryptography": true,
         "ethereumjs-wallet>ethereumjs-util>ethjs-util": true,
         "ganache>secp256k1>elliptic": true
       }
diff --git a/package.json b/package.json
index 40c0dd36a..f8957699d 100644
--- a/package.json
+++ b/package.json
@@ -255,7 +255,7 @@
     "@metamask/snaps-ui": "^0.30.0",
     "@metamask/snaps-utils": "^0.30.0",
     "@metamask/subject-metadata-controller": "^1.0.0",
-    "@metamask/utils": "^3.6.0",
+    "@metamask/utils": "^5.0.0",
     "@ngraveio/bc-ur": "^1.1.6",
     "@popperjs/core": "^2.4.0",
     "@reduxjs/toolkit": "^1.6.2",
diff --git a/yarn.lock b/yarn.lock
index f16c5ce3c..e05d1c415 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1680,6 +1680,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@chainsafe/as-sha256@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "@chainsafe/as-sha256@npm:0.3.1"
+  checksum: 58ea733be1657b0e31dbf48b0dba862da0833df34a81c1460c7352f04ce90874f70003cbf34d0afb9e5e53a33ee2d63a261a8b12462be85b2ba0a6f7f13d6150
+  languageName: node
+  linkType: hard
+
+"@chainsafe/persistent-merkle-tree@npm:^0.4.2":
+  version: 0.4.2
+  resolution: "@chainsafe/persistent-merkle-tree@npm:0.4.2"
+  dependencies:
+    "@chainsafe/as-sha256": ^0.3.1
+  checksum: f9cfcb2132a243992709715dbd28186ab48c7c0c696f29d30857693cca5526bf753974a505ef68ffd5623bbdbcaa10f9083f4dd40bf99eb6408e451cc26a1a9e
+  languageName: node
+  linkType: hard
+
+"@chainsafe/ssz@npm:0.9.4":
+  version: 0.9.4
+  resolution: "@chainsafe/ssz@npm:0.9.4"
+  dependencies:
+    "@chainsafe/as-sha256": ^0.3.1
+    "@chainsafe/persistent-merkle-tree": ^0.4.2
+    case: ^1.6.3
+  checksum: c6eaedeae9e5618b3c666ff4507a27647f665a8dcf17d5ca86da4ed4788c5a93868f256d0005467d184fdf35ec03f323517ec2e55ec42492d769540a2ec396bc
+  languageName: node
+  linkType: hard
+
 "@choojs/findup@npm:^0.2.1":
   version: 0.2.1
   resolution: "@choojs/findup@npm:0.2.1"
@@ -1999,12 +2026,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/rlp@npm:^4.0.0-beta.2":
-  version: 4.0.0
-  resolution: "@ethereumjs/rlp@npm:4.0.0"
+"@ethereumjs/common@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "@ethereumjs/common@npm:3.1.1"
+  dependencies:
+    "@ethereumjs/util": ^8.0.5
+    crc-32: ^1.2.0
+  checksum: 58602dee9fbcf691dca111b4fd7fd5770f5e86d68012ce48fba396c7038afdca4fca273a9cf39f88cf6ea7b256603a4bd214e94e9d01361efbcd060460b78952
+  languageName: node
+  linkType: hard
+
+"@ethereumjs/rlp@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@ethereumjs/rlp@npm:4.0.1"
   bin:
     rlp: bin/rlp
-  checksum: 407dfb8b1e09b4282e6be561e8d74f8939da78f460c08456c7ba2fb273fc42ee16027955a07085abfd7600ffb466c4c4add159885e67abb91bc85db9dd81ffb5
+  checksum: 30db19c78faa2b6ff27275ab767646929207bb207f903f09eb3e4c273ce2738b45f3c82169ddacd67468b4f063d8d96035f2bf36f02b6b7e4d928eefe2e3ecbc
   languageName: node
   linkType: hard
 
@@ -2028,14 +2065,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/util@npm:^8.0.0, @ethereumjs/util@npm:^8.0.2":
-  version: 8.0.3
-  resolution: "@ethereumjs/util@npm:8.0.3"
+"@ethereumjs/tx@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "@ethereumjs/tx@npm:4.1.1"
   dependencies:
-    "@ethereumjs/rlp": ^4.0.0-beta.2
-    async: ^3.2.4
+    "@chainsafe/ssz": 0.9.4
+    "@ethereumjs/common": ^3.1.1
+    "@ethereumjs/rlp": ^4.0.1
+    "@ethereumjs/util": ^8.0.5
+    "@ethersproject/providers": ^5.7.2
     ethereum-cryptography: ^1.1.2
-  checksum: f41b9b1f491d65393fe33431ad2c723bdbf405358e201af3bd9ed2dbf04b6002f039e425681534084fd9b4b11d8c27d2ba521682fe2f49518f6891833246a698
+  peerDependencies:
+    c-kzg: ^1.0.8
+  peerDependenciesMeta:
+    c-kzg:
+      optional: true
+  checksum: 98897e79adf03ee90ed98c6a543e15e0b4e127bc5bc381d70cdcc76b111574205b94869c29d925ea9e30a98e5ef8b0f5597914359deb9db552017b2e78ef17a8
+  languageName: node
+  linkType: hard
+
+"@ethereumjs/util@npm:^8.0.0, @ethereumjs/util@npm:^8.0.2, @ethereumjs/util@npm:^8.0.5":
+  version: 8.0.5
+  resolution: "@ethereumjs/util@npm:8.0.5"
+  dependencies:
+    "@chainsafe/ssz": 0.9.4
+    "@ethereumjs/rlp": ^4.0.1
+    ethereum-cryptography: ^1.1.2
+  checksum: 318386785295b4584289b1aa576d2621392b3a918d127890db62d3f74184f3377694dd9e951e19bfb9ab80e8dc9e38e180236cac2651dead26097d10963731f9
   languageName: node
   linkType: hard
 
@@ -4408,7 +4464,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.3.0, @metamask/utils@npm:^3.3.1, @metamask/utils@npm:^3.4.0, @metamask/utils@npm:^3.4.1, @metamask/utils@npm:^3.6.0":
+"@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.3.0, @metamask/utils@npm:^3.3.1, @metamask/utils@npm:^3.4.0, @metamask/utils@npm:^3.4.1":
   version: 3.6.0
   resolution: "@metamask/utils@npm:3.6.0"
   dependencies:
@@ -4420,6 +4476,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/utils@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@metamask/utils@npm:5.0.0"
+  dependencies:
+    "@ethereumjs/tx": ^4.1.1
+    "@types/debug": ^4.1.7
+    debug: ^4.3.4
+    semver: ^7.3.8
+    superstruct: ^1.0.3
+  checksum: 34e39fc0bf28db5fe92676753de3291b05a517f8c81dbe332a4b6002739a58450a89fb2bddd85922a4f420affb1674604e6ad4627cdf052459e5371361ef7dd2
+  languageName: node
+  linkType: hard
+
 "@mrmlnc/readdir-enhanced@npm:^2.2.1":
   version: 2.2.1
   resolution: "@mrmlnc/readdir-enhanced@npm:2.2.1"
@@ -9764,13 +9833,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^3.2.4":
-  version: 3.2.4
-  resolution: "async@npm:3.2.4"
-  checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89
-  languageName: node
-  linkType: hard
-
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -11572,6 +11634,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"case@npm:^1.6.3":
+  version: 1.6.3
+  resolution: "case@npm:1.6.3"
+  checksum: febe73278f910b0d28aab7efd6f51c235f9aa9e296148edb56dfb83fd58faa88308c30ce9a0122b6e53e0362c44f4407105bd5ef89c46860fc2b184e540fd68d
+  languageName: node
+  linkType: hard
+
 "caseless@npm:~0.12.0":
   version: 0.12.0
   resolution: "caseless@npm:0.12.0"
@@ -24231,7 +24300,7 @@ __metadata:
     "@metamask/snaps-utils": ^0.30.0
     "@metamask/subject-metadata-controller": ^1.0.0
     "@metamask/test-dapp": ^5.6.0
-    "@metamask/utils": ^3.6.0
+    "@metamask/utils": ^5.0.0
     "@ngraveio/bc-ur": ^1.1.6
     "@popperjs/core": ^2.4.0
     "@reduxjs/toolkit": ^1.6.2

From dce4c6d7c5ed6a99d99f20aca00e3db16840e458 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Thu, 16 Mar 2023 11:45:44 +0100
Subject: [PATCH 009/129] [FLASK] Fix overflow issues with text coming from
 snap UI (#18169)

---
 .../app/flask/snap-ui-markdown/snap-ui-markdown.js          | 6 +++++-
 .../app/flask/snap-ui-renderer/snap-ui-renderer.js          | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/components/app/flask/snap-ui-markdown/snap-ui-markdown.js b/ui/components/app/flask/snap-ui-markdown/snap-ui-markdown.js
index 080dbf900..359521152 100644
--- a/ui/components/app/flask/snap-ui-markdown/snap-ui-markdown.js
+++ b/ui/components/app/flask/snap-ui-markdown/snap-ui-markdown.js
@@ -1,7 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ReactMarkdown from 'react-markdown';
-import { TypographyVariant } from '../../../../helpers/constants/design-system';
+import {
+  TypographyVariant,
+  OVERFLOW_WRAP,
+} from '../../../../helpers/constants/design-system';
 import Typography from '../../../ui/typography/typography';
 
 const Paragraph = (props) => (
@@ -9,6 +12,7 @@ const Paragraph = (props) => (
     {...props}
     variant={TypographyVariant.H6}
     className="snap-ui-markdown__text"
+    overflowWrap={OVERFLOW_WRAP.BREAK_WORD}
   />
 );
 
diff --git a/ui/components/app/flask/snap-ui-renderer/snap-ui-renderer.js b/ui/components/app/flask/snap-ui-renderer/snap-ui-renderer.js
index 11f1319d3..731bd599f 100644
--- a/ui/components/app/flask/snap-ui-renderer/snap-ui-renderer.js
+++ b/ui/components/app/flask/snap-ui-renderer/snap-ui-renderer.js
@@ -9,6 +9,7 @@ import {
   FONT_WEIGHT,
   DISPLAY,
   FLEX_DIRECTION,
+  OVERFLOW_WRAP,
 } from '../../../../helpers/constants/design-system';
 import { SnapDelineator } from '../snap-delineator';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
@@ -33,6 +34,7 @@ export const UI_MAPPING = {
     props: {
       variant: TypographyVariant.H3,
       fontWeight: FONT_WEIGHT.BOLD,
+      overflowWrap: OVERFLOW_WRAP.BREAK_WORD,
     },
   }),
   text: (props) => ({

From 0b83b13b4a732b6d9f02b0f0148278fa245da867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Thu, 16 Mar 2023 11:03:54 +0000
Subject: [PATCH 010/129] MMI adds the Jwt dropdown component (#18117)

* MMI adds the Jwt dropdown

* MMI prettier

* review fixes

* MMI added stories file
---
 .../__snapshots__/jwt-dropdown.test.js.snap   | 43 ++++++++++++++
 .../institutional/jwt-dropdown/index.js       |  1 +
 .../jwt-dropdown/jwt-dropdown.js              | 58 +++++++++++++++++++
 .../jwt-dropdown/jwt-dropdown.scss            | 10 ++++
 .../jwt-dropdown/jwt-dropdown.stories.js      | 19 ++++++
 .../jwt-dropdown/jwt-dropdown.test.js         | 23 ++++++++
 6 files changed, 154 insertions(+)
 create mode 100644 ui/components/institutional/jwt-dropdown/__snapshots__/jwt-dropdown.test.js.snap
 create mode 100644 ui/components/institutional/jwt-dropdown/index.js
 create mode 100644 ui/components/institutional/jwt-dropdown/jwt-dropdown.js
 create mode 100644 ui/components/institutional/jwt-dropdown/jwt-dropdown.scss
 create mode 100644 ui/components/institutional/jwt-dropdown/jwt-dropdown.stories.js
 create mode 100644 ui/components/institutional/jwt-dropdown/jwt-dropdown.test.js

diff --git a/ui/components/institutional/jwt-dropdown/__snapshots__/jwt-dropdown.test.js.snap b/ui/components/institutional/jwt-dropdown/__snapshots__/jwt-dropdown.test.js.snap
new file mode 100644
index 000000000..2612ae47c
--- /dev/null
+++ b/ui/components/institutional/jwt-dropdown/__snapshots__/jwt-dropdown.test.js.snap
@@ -0,0 +1,43 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`JwtDropdown should render the Jwt dropdown component 1`] = `
+<div>
+  <div
+    class="box box--flex-direction-row"
+  >
+    <p
+      class="box mm-text custody-search-jwt__select-title mm-text--body-md mm-text--color-text-default box--padding-1 box--flex-direction-row"
+    >
+      [selectJWT]
+    </p>
+    <div
+      class="dropdown custody-search-jwt__select"
+    >
+      <select
+        class="dropdown__select"
+        data-testid="jwt-dropdown"
+      >
+        <option
+          value="someToken"
+        >
+          someToken
+        </option>
+        <option
+          value="jwy1"
+        >
+          ...jwy1
+        </option>
+        <option
+          value="jwt2"
+        >
+          ...jwt2
+        </option>
+      </select>
+      <span
+        class="box dropdown__icon-caret-down mm-icon mm-icon--size-sm box--display-inline-block box--flex-direction-row box--color-inherit"
+        style="mask-image: url('./images/icons/arrow-down.svg');"
+      />
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/institutional/jwt-dropdown/index.js b/ui/components/institutional/jwt-dropdown/index.js
new file mode 100644
index 000000000..455c3c0ae
--- /dev/null
+++ b/ui/components/institutional/jwt-dropdown/index.js
@@ -0,0 +1 @@
+export { default } from './jwt-dropdown';
diff --git a/ui/components/institutional/jwt-dropdown/jwt-dropdown.js b/ui/components/institutional/jwt-dropdown/jwt-dropdown.js
new file mode 100644
index 000000000..fd1fc4f28
--- /dev/null
+++ b/ui/components/institutional/jwt-dropdown/jwt-dropdown.js
@@ -0,0 +1,58 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Dropdown from '../../ui/dropdown';
+import Box from '../../ui/box';
+import { Color } from '../../../helpers/constants/design-system';
+import { Text } from '../../component-library';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+const JwtDropdown = (props) => {
+  const t = useI18nContext();
+  const { currentJwt, jwtList } = props;
+
+  return (
+    <Box>
+      <Text
+        padding={1}
+        color={Color.textDefault}
+        className="custody-search-jwt__select-title"
+      >
+        {t('selectJWT')}
+      </Text>
+      <Dropdown
+        data-testid="jwt-dropdown"
+        className="custody-search-jwt__select"
+        name="jwt-select"
+        selectedOption={currentJwt}
+        options={[
+          ...(jwtList.find((item) => item === currentJwt)
+            ? []
+            : [
+                {
+                  value: currentJwt,
+                  name:
+                    currentJwt.length > 9
+                      ? `...${currentJwt.slice(-9)}`
+                      : currentJwt,
+                },
+              ]),
+          ...jwtList.map((text) => {
+            return {
+              value: text,
+              name: `...${text?.slice(-9)}`,
+            };
+          }),
+        ]}
+        onChange={(opt) => props.onChange(opt.value)}
+      />
+    </Box>
+  );
+};
+
+JwtDropdown.propTypes = {
+  jwtList: PropTypes.array,
+  currentJwt: PropTypes.string,
+  onChange: PropTypes.func,
+};
+
+export default JwtDropdown;
diff --git a/ui/components/institutional/jwt-dropdown/jwt-dropdown.scss b/ui/components/institutional/jwt-dropdown/jwt-dropdown.scss
new file mode 100644
index 000000000..61d04f3bb
--- /dev/null
+++ b/ui/components/institutional/jwt-dropdown/jwt-dropdown.scss
@@ -0,0 +1,10 @@
+.custody-search-jwt__select {
+  height: 54px;
+  width: 100%;
+  display: flex;
+  align-items: center;
+
+  &-title {
+    @include Paragraph;
+  }
+}
diff --git a/ui/components/institutional/jwt-dropdown/jwt-dropdown.stories.js b/ui/components/institutional/jwt-dropdown/jwt-dropdown.stories.js
new file mode 100644
index 000000000..e691dc602
--- /dev/null
+++ b/ui/components/institutional/jwt-dropdown/jwt-dropdown.stories.js
@@ -0,0 +1,19 @@
+import React from 'react';
+import { action } from '@storybook/addon-actions';
+import JwtDropdown from '.';
+
+export default {
+  title: 'Components/Institutional/JwtDropdown',
+  component: JwtDropdown,
+  args: {
+    jwtList: ['jwt1', 'jwt2'],
+    currentJwt: 'jwt1',
+    onChange: () => {
+      action('onChange');
+    },
+  },
+};
+
+export const DefaultStory = (args) => <JwtDropdown {...args} />;
+
+DefaultStory.storyName = 'JwtDropdown';
diff --git a/ui/components/institutional/jwt-dropdown/jwt-dropdown.test.js b/ui/components/institutional/jwt-dropdown/jwt-dropdown.test.js
new file mode 100644
index 000000000..58fdc2aa5
--- /dev/null
+++ b/ui/components/institutional/jwt-dropdown/jwt-dropdown.test.js
@@ -0,0 +1,23 @@
+import { render, fireEvent } from '@testing-library/react';
+import React from 'react';
+import sinon from 'sinon';
+import JwtDropdown from './jwt-dropdown';
+
+describe('JwtDropdown', () => {
+  it('should render the Jwt dropdown component', () => {
+    const props = {
+      jwtList: ['jwy1', 'jwt2'],
+      currentJwt: 'someToken',
+      onChange: sinon.spy(),
+    };
+
+    const { getByTestId, container } = render(<JwtDropdown {...props} />);
+
+    fireEvent.change(getByTestId('jwt-dropdown'), {
+      target: { value: 'jwt2' },
+    });
+
+    expect(getByTestId('jwt-dropdown')).toBeDefined();
+    expect(container).toMatchSnapshot();
+  });
+});

From 0a376fe3ab662d30d53d334025e2089788d57803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Thu, 16 Mar 2023 11:26:00 +0000
Subject: [PATCH 011/129] MMI adds the note-to-trader component (#18106)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* MMI adds the note-to-trader component

* MMI adds colors vars

* MMI added component folder

* MMI adds fireEvent

* adds Box

* review fixes

* adds story

* lint fix

* prettier fix

* prettier fix

---------

Co-authored-by: Albert Olivé <albertolivecorbella@gmail.com>
---
 .../__snapshots__/note-to-trader.test.js.snap | 35 ++++++++++++
 .../institutional/note-to-trader/index.js     |  1 +
 .../institutional/note-to-trader/index.scss   | 23 ++++++++
 .../note-to-trader/note-to-trader.js          | 53 +++++++++++++++++++
 .../note-to-trader/note-to-trader.stories.js  | 21 ++++++++
 .../note-to-trader/note-to-trader.test.js     | 23 ++++++++
 6 files changed, 156 insertions(+)
 create mode 100644 ui/components/institutional/note-to-trader/__snapshots__/note-to-trader.test.js.snap
 create mode 100644 ui/components/institutional/note-to-trader/index.js
 create mode 100644 ui/components/institutional/note-to-trader/index.scss
 create mode 100644 ui/components/institutional/note-to-trader/note-to-trader.js
 create mode 100644 ui/components/institutional/note-to-trader/note-to-trader.stories.js
 create mode 100644 ui/components/institutional/note-to-trader/note-to-trader.test.js

diff --git a/ui/components/institutional/note-to-trader/__snapshots__/note-to-trader.test.js.snap b/ui/components/institutional/note-to-trader/__snapshots__/note-to-trader.test.js.snap
new file mode 100644
index 000000000..94a2fff67
--- /dev/null
+++ b/ui/components/institutional/note-to-trader/__snapshots__/note-to-trader.test.js.snap
@@ -0,0 +1,35 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NoteToTrader should render the Note to trader component 1`] = `
+<div>
+  <div
+    class="box note-header box--display-flex box--flex-direction-row box--justify-content-space-between"
+  >
+    <label
+      class="box mm-text mm-label mm-label--html-for mm-text--body-md mm-text--font-weight-bold mm-text--color-text-default box--display-inline-flex box--flex-direction-row box--align-items-center"
+      for="transaction-note"
+    >
+      Transaction note
+    </label>
+    <p
+      class="box mm-text note-header__counter mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+    >
+      9
+      /
+      280
+    </p>
+  </div>
+  <div
+    class="box note-field box--display-flex box--flex-direction-column"
+  >
+    <textarea
+      data-testid="transaction-note"
+      id="transaction-note"
+      maxlength="280"
+      placeholder=""
+    >
+      some text
+    </textarea>
+  </div>
+</div>
+`;
diff --git a/ui/components/institutional/note-to-trader/index.js b/ui/components/institutional/note-to-trader/index.js
new file mode 100644
index 000000000..58b37d910
--- /dev/null
+++ b/ui/components/institutional/note-to-trader/index.js
@@ -0,0 +1 @@
+export { default } from './note-to-trader';
diff --git a/ui/components/institutional/note-to-trader/index.scss b/ui/components/institutional/note-to-trader/index.scss
new file mode 100644
index 000000000..692ef8a5c
--- /dev/null
+++ b/ui/components/institutional/note-to-trader/index.scss
@@ -0,0 +1,23 @@
+.note-header {
+  line-height: 100%;
+  margin: 0 0 5px 0;
+
+  label {
+    color: var(--black);
+    margin: 0 0 4px 0;
+  }
+}
+
+.note-field {
+  textarea {
+    min-height: 90px;
+    border-radius: 5px;
+    padding: 10px;
+    font-size: 12px;
+    resize: none;
+
+    &::placeholder {
+      color: var(--color-icon-alternative);
+    }
+  }
+}
diff --git a/ui/components/institutional/note-to-trader/note-to-trader.js b/ui/components/institutional/note-to-trader/note-to-trader.js
new file mode 100644
index 000000000..5d8ba4c92
--- /dev/null
+++ b/ui/components/institutional/note-to-trader/note-to-trader.js
@@ -0,0 +1,53 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  DISPLAY,
+  FLEX_DIRECTION,
+  JustifyContent,
+} from '../../../helpers/constants/design-system';
+import { Label, Text } from '../../component-library';
+import Box from '../../ui/box';
+
+const NoteToTrader = (props) => {
+  const { placeholder, maxLength, onChange, noteText, labelText } = props;
+
+  return (
+    <>
+      <Box
+        className="note-header"
+        display={DISPLAY.FLEX}
+        justifyContent={JustifyContent.spaceBetween}
+      >
+        <Label htmlFor="transaction-note">{labelText}</Label>
+        <Text className="note-header__counter">
+          {noteText.length}/{maxLength}
+        </Text>
+      </Box>
+      <Box
+        display={DISPLAY.FLEX}
+        flexDirection={FLEX_DIRECTION.COLUMN}
+        className="note-field"
+      >
+        <textarea
+          id="transaction-note"
+          data-testid="transaction-note"
+          onChange={({ target: { value } }) => onChange(value)}
+          autoFocus
+          maxLength={maxLength}
+          placeholder={placeholder}
+          value={noteText}
+        />
+      </Box>
+    </>
+  );
+};
+
+NoteToTrader.propTypes = {
+  placeholder: PropTypes.string,
+  maxLength: PropTypes.string,
+  onChange: PropTypes.func,
+  noteText: PropTypes.string,
+  labelText: PropTypes.string,
+};
+
+export default NoteToTrader;
diff --git a/ui/components/institutional/note-to-trader/note-to-trader.stories.js b/ui/components/institutional/note-to-trader/note-to-trader.stories.js
new file mode 100644
index 000000000..a33412ca0
--- /dev/null
+++ b/ui/components/institutional/note-to-trader/note-to-trader.stories.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import NoteToTrader from '.';
+
+export default {
+  title: 'Components/Institutional/NoteToTrader',
+  component: NoteToTrader,
+  args: {
+    placeholder:
+      'The approver will see this note when approving the transaction at the custodian.',
+    noteText: '',
+    labelText: 'Transaction note',
+    maxLength: '280',
+    onChange: () => {
+      /**/
+    },
+  },
+};
+
+export const DefaultStory = (args) => <NoteToTrader {...args} />;
+
+DefaultStory.storyName = 'NoteToTrader';
diff --git a/ui/components/institutional/note-to-trader/note-to-trader.test.js b/ui/components/institutional/note-to-trader/note-to-trader.test.js
new file mode 100644
index 000000000..f738189fd
--- /dev/null
+++ b/ui/components/institutional/note-to-trader/note-to-trader.test.js
@@ -0,0 +1,23 @@
+import { render, fireEvent } from '@testing-library/react';
+import React from 'react';
+import sinon from 'sinon';
+import NoteToTrader from './note-to-trader';
+
+describe('NoteToTrader', () => {
+  it('should render the Note to trader component', () => {
+    const props = {
+      placeholder: '',
+      maxLength: '280',
+      noteText: 'some text',
+      labelText: 'Transaction note',
+      onChange: sinon.spy(),
+    };
+
+    const { getByTestId, container } = render(<NoteToTrader {...props} />);
+
+    fireEvent.change(getByTestId('transaction-note'));
+    expect(getByTestId('transaction-note').value).toBe('some text');
+    expect(getByTestId('transaction-note')).toBeDefined();
+    expect(container).toMatchSnapshot();
+  });
+});

From 4a0f47d74eca08ed354735b880d2c0c06c9e798c Mon Sep 17 00:00:00 2001
From: Hassan Malik <41640681+hmalik88@users.noreply.github.com>
Date: Thu, 16 Mar 2023 10:39:25 -0400
Subject: [PATCH 012/129] [FLASK] Add hardcoded derivation paths (#18176)

* added allowlisted protocol snap's derivation paths

* added missing path
---
 shared/constants/snaps.ts | 92 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 1 deletion(-)

diff --git a/shared/constants/snaps.ts b/shared/constants/snaps.ts
index 7d6d0ea53..6a272cbb8 100644
--- a/shared/constants/snaps.ts
+++ b/shared/constants/snaps.ts
@@ -52,13 +52,103 @@ type SnapsDerivationPath = {
 export const SNAPS_DERIVATION_PATHS: SnapsDerivationPath[] = [
   {
     path: ['m', `44'`, `0'`],
+    curve: 'ed25519',
+    name: 'Test BIP-32 Path (ed25519)',
+  },
+  {
+    path: ['m', `44'`, `1'`],
     curve: 'secp256k1',
     name: 'Test BIP-32 Path (secp256k1)',
   },
   {
     path: ['m', `44'`, `0'`],
+    curve: 'secp256k1',
+    name: 'Bitcoin Legacy',
+  },
+  {
+    path: ['m', `49'`, `0'`],
+    curve: 'secp256k1',
+    name: 'Bitcoin Nested SegWit',
+  },
+  {
+    path: ['m', `49'`, `1'`],
+    curve: 'secp256k1',
+    name: 'Bitcoin Testnet Nested SegWit',
+  },
+  {
+    path: ['m', `84'`, `0'`],
+    curve: 'secp256k1',
+    name: 'Bitcoin Native SegWit',
+  },
+  {
+    path: ['m', `84'`, `1'`],
+    curve: 'secp256k1',
+    name: 'Bitcoin Testnet Native SegWit',
+  },
+  {
+    path: ['m', `44'`, `501'`],
+    curve: 'secp256k1',
+    name: 'Solana',
+  },
+  {
+    path: ['m', `44'`, `2'`],
+    curve: 'secp256k1',
+    name: 'Litecoin',
+  },
+  {
+    path: ['m', `44'`, `3'`],
+    curve: 'secp256k1',
+    name: 'Dogecoin',
+  },
+  {
+    path: ['m', `44'`, `60'`],
+    curve: 'secp256k1',
+    name: 'Ethereum',
+  },
+  {
+    path: ['m', `44'`, `118'`],
+    curve: 'secp256k1',
+    name: 'Atom',
+  },
+  {
+    path: ['m', `44'`, `145'`],
+    curve: 'secp256k1',
+    name: 'Bitcoin Cash',
+  },
+  {
+    path: ['m', `44'`, `714'`],
+    curve: 'secp256k1',
+    name: 'Binance (BNB)',
+  },
+  {
+    path: ['m', `44'`, `931'`],
+    curve: 'secp256k1',
+    name: 'THORChain (RUNE)',
+  },
+  {
+    path: ['m', `44'`, `330'`],
+    curve: 'secp256k1',
+    name: 'Terra (LUNA)',
+  },
+  {
+    path: ['m', `44'`, `459'`],
+    curve: 'secp256k1',
+    name: 'Kava',
+  },
+  {
+    path: ['m', `44'`, `529'`],
+    curve: 'secp256k1',
+    name: 'Secret Network',
+  },
+  {
+    path: ['m', `44'`, `397'`],
     curve: 'ed25519',
-    name: 'Test BIP-32 Path (ed25519)',
+    name: 'NEAR Protocol',
+  },
+  {
+    path: ['m', `44'`, `1'`, `0'`],
+    curve: 'ed25519',
+    name: 'NEAR Protocol Testnet',
   },
 ];
 ///: END:ONLY_INCLUDE_IN

From 2ccc51516b4425e0af7e2d426150d23212c32508 Mon Sep 17 00:00:00 2001
From: mirjanaKukic <94608179+mirjanaKukic@users.noreply.github.com>
Date: Thu, 16 Mar 2023 16:03:03 +0100
Subject: [PATCH 013/129] add e2e test for onboarding flow (#15122)

* add e2e test for onboarding flow

* Add method to test if we create a new wallet

* fix code

* editng code

* Add test if import wrong SRP

* fix test

* add test where we chack if user select diffrent type of SRP

* update test for checking if user select different SRP

* update code

* add test for if user enter wrong password in confirm password field

* add two test to verify if user is on correct page after import wallet

* update cod

* lint fix

* fix code to test pass

* fix code

* improve code

* change completeCreateNewWalletOnboardingFlow function parameters and update code

* delete unnecessary wait

---------

Co-authored-by: dzfjz <120640011+dzfjz@users.noreply.github.com>
Co-authored-by: dzfjz <dzenana.fejzic-ext@consensys.net>
---
 test/e2e/helpers.js               |  89 +++++++++++++
 test/e2e/tests/onboarding.spec.js | 215 ++++++++++++++++++++++++++++++
 2 files changed, 304 insertions(+)

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 4efd0ba1b..231fa0b57 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -1,3 +1,4 @@
+const { strict: assert } = require('assert');
 const path = require('path');
 const { promises: fs } = require('fs');
 const BigNumber = require('bignumber.js');
@@ -289,6 +290,91 @@ const completeImportSRPOnboardingFlowWordByWord = async (
   await driver.clickElement('[data-testid="pin-extension-done"]');
 };
 
+const completeCreateNewWalletOnboardingFlow = async (driver, password) => {
+  // welcome
+  await driver.clickElement('[data-testid="onboarding-create-wallet"]');
+
+  // metrics
+  await driver.clickElement('[data-testid="metametrics-no-thanks"]');
+
+  // create password
+  await driver.fill('[data-testid="create-password-new"]', 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-wallet"]');
+
+  // secure my wallet
+  await driver.clickElement('[data-testid="secure-wallet-recommended"]');
+
+  // reveal SRP
+  await driver.clickElement('[data-testid="recovery-phrase-reveal"]');
+
+  const revealedSeedPhrase = await driver.findElement(
+    '[data-testid="recovery-phrase-chips"]',
+  );
+
+  const recoveryPhrase = await revealedSeedPhrase.getText();
+
+  await driver.clickElement('[data-testid="recovery-phrase-next"]');
+
+  // confirm SRP
+  const words = recoveryPhrase.split(/\s*(?:[0-9)]+|\n|\.|^$|$)\s*/u);
+  const finalWords = words.filter((str) => str !== '');
+  assert.equal(finalWords.length, 12);
+
+  await driver.fill('[data-testid="recovery-phrase-input-2"]', finalWords[2]);
+  await driver.fill('[data-testid="recovery-phrase-input-3"]', finalWords[3]);
+  await driver.fill('[data-testid="recovery-phrase-input-7"]', finalWords[7]);
+
+  await driver.clickElement('[data-testid="confirm-recovery-phrase"]');
+
+  await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+  // complete
+  await driver.findElement({ text: 'Wallet creation successful', tag: 'h2' });
+  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"]');
+};
+
+const importWrongSRPOnboardingFlow = async (driver, seedPhrase) => {
+  // welcome
+  await driver.clickElement('[data-testid="onboarding-import-wallet"]');
+
+  // metrics
+  await driver.clickElement('[data-testid="metametrics-no-thanks"]');
+
+  // import with recovery phrase
+  await driver.pasteIntoField(
+    '[data-testid="import-srp__srp-word-0"]',
+    seedPhrase,
+  );
+
+  const warningText = 'Invalid Secret Recovery Phrase';
+  const warnings = await driver.findElements('.actionable-message__message');
+  const warning = warnings[1];
+
+  assert.equal(await warning.getText(), warningText);
+};
+
+const selectDropdownByNum = async (elements, index) => {
+  await elements[index].click();
+};
+
+const testSRPDropdownIterations = async (options, driver, iterations) => {
+  for (let i = 0; i < iterations; i++) {
+    await selectDropdownByNum(options, i);
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+
+    const formFields = await driver.findElements('.import-srp__srp-word-label');
+    const expectedNumFields = 12 + i * 3;
+    const actualNumFields = formFields.length;
+    assert.equal(actualNumFields, expectedNumFields);
+  }
+};
+
 module.exports = {
   getWindowHandles,
   convertToHexValue,
@@ -300,5 +386,8 @@ module.exports = {
   importSRPOnboardingFlow,
   completeImportSRPOnboardingFlow,
   completeImportSRPOnboardingFlowWordByWord,
+  completeCreateNewWalletOnboardingFlow,
   createDownloadFolder,
+  importWrongSRPOnboardingFlow,
+  testSRPDropdownIterations,
 };
diff --git a/test/e2e/tests/onboarding.spec.js b/test/e2e/tests/onboarding.spec.js
index 3430c3efc..2c4b8e6bb 100644
--- a/test/e2e/tests/onboarding.spec.js
+++ b/test/e2e/tests/onboarding.spec.js
@@ -1,8 +1,13 @@
 const { strict: assert } = require('assert');
+const { By } = require('selenium-webdriver');
 const {
   convertToHexValue,
   withFixtures,
+  completeCreateNewWalletOnboardingFlow,
+  completeImportSRPOnboardingFlow,
   importSRPOnboardingFlow,
+  importWrongSRPOnboardingFlow,
+  testSRPDropdownIterations,
 } = require('../helpers');
 const FixtureBuilder = require('../fixture-builder');
 
@@ -10,6 +15,10 @@ describe('MetaMask onboarding', function () {
   const testSeedPhrase =
     'forum vessel pink push lonely enact gentle tail admit parrot grunt dress';
   const testPassword = 'correct horse battery staple';
+  const wrongSeedPhrase =
+    'test test test test test test test test test test test test';
+  const wrongTestPassword = 'test test test test';
+
   const ganacheOptions = {
     accounts: [
       {
@@ -19,6 +28,212 @@ describe('MetaMask onboarding', function () {
       },
     ],
   };
+
+  it('Clicks create a new wallet, accepts a secure password, reveals the Secret Recovery Phrase, confirm SRP', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+
+        await completeCreateNewWalletOnboardingFlow(driver, testPassword);
+
+        const homePage = await driver.findElement('.home__main-view');
+        const homePageDisplayed = await homePage.isDisplayed();
+
+        assert.equal(homePageDisplayed, true);
+      },
+    );
+  });
+
+  it('Clicks import a new wallet, accepts a secure password, reveals the Secret Recovery Phrase, confirm SRP', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+
+        await completeImportSRPOnboardingFlow(
+          driver,
+          testSeedPhrase,
+          testPassword,
+        );
+
+        const homePage = await driver.findElement('.home__main-view');
+        const homePageDisplayed = await homePage.isDisplayed();
+
+        assert.equal(homePageDisplayed, true);
+      },
+    );
+  });
+
+  it('User import wrong Secret Recovery Phrase', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+
+        await importWrongSRPOnboardingFlow(driver, wrongSeedPhrase);
+
+        const confirmSeedPhrase = await driver.findElement(
+          '[data-testid="import-srp-confirm"]',
+        );
+
+        assert.equal(await confirmSeedPhrase.isEnabled(), false);
+      },
+    );
+  });
+
+  it('Check if user select different type of secret recovery phrase', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+
+        // welcome
+        await driver.clickElement('[data-testid="onboarding-import-wallet"]');
+
+        await driver.clickElement('[data-testid="metametrics-no-thanks"]');
+
+        const dropdowns = await driver.findElements('select');
+        const dropdownElement = dropdowns[1];
+        await dropdownElement.click();
+        const options = await dropdownElement.findElements(
+          By.tagName('option'),
+        );
+
+        const iterations = options.length;
+
+        await testSRPDropdownIterations(options, driver, iterations);
+
+        const finalFormFields = await driver.findElements(
+          '.import-srp__srp-word-label',
+        );
+        const expectedFinalNumFields = 24; // The last iteration will have 24 fields
+        const actualFinalNumFields = finalFormFields.length;
+        assert.equal(actualFinalNumFields, expectedFinalNumFields);
+      },
+    );
+  });
+
+  it('User enters the wrong password during password creation', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+
+        await driver.clickElement('[data-testid="onboarding-create-wallet"]');
+
+        // metrics
+        await driver.clickElement('[data-testid="metametrics-no-thanks"]');
+
+        // Fill in confirm password field with incorrect password
+        await driver.fill('[data-testid="create-password-new"]', testPassword);
+        await driver.fill(
+          '[data-testid="create-password-confirm"]',
+          wrongTestPassword,
+        );
+
+        // Check that the error message is displayed for the password fields
+        await driver.isElementPresent(
+          // eslint-disable-next-line prettier/prettier
+            { text: 'Passwords don\'t match', tag: 'h6' },
+          true,
+        );
+
+        // Check that the "Confirm Password" button is disabled
+        const confirmPasswordButton = await driver.findElement(
+          '[data-testid="create-password-wallet"]',
+        );
+        assert.equal(await confirmPasswordButton.isEnabled(), false);
+      },
+    );
+  });
+
+  it('Verify that the user has been redirected to the correct page after importing their wallet', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+
+        await importSRPOnboardingFlow(driver, testSeedPhrase, testPassword);
+        // Verify site
+        assert.equal(
+          await driver.isElementPresent({
+            text: 'Wallet creation successful',
+            tag: 'h2',
+          }),
+          true,
+        );
+      },
+    );
+  });
+
+  it('Verify that the user has been redirected to the correct page after creating a password for their new wallet', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder({ onboarding: true }).build(),
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+
+        await driver.clickElement('[data-testid="onboarding-create-wallet"]');
+
+        // metrics
+        await driver.clickElement('[data-testid="metametrics-no-thanks"]');
+
+        // Fill in confirm password field with correct password
+        await driver.fill('[data-testid="create-password-new"]', testPassword);
+        await driver.fill(
+          '[data-testid="create-password-confirm"]',
+          testPassword,
+        );
+        await driver.clickElement('[data-testid="create-password-terms"]');
+        await driver.clickElement('[data-testid="create-password-wallet"]');
+
+        // Verify site
+        assert.equal(
+          await driver.isElementPresent({
+            text: 'Secure your wallet',
+            tag: 'h2',
+          }),
+          true,
+        );
+      },
+    );
+  });
+
   const ganacheOptions2 = {
     accounts: [
       {

From 8ee6ece28cb977c74b07c5023b1797ee5d4ef335 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Thu, 16 Mar 2023 10:34:57 -0700
Subject: [PATCH 014/129] Expanding storybook controls with proptype
 descriptions (#18159)

---
 .storybook/preview.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.storybook/preview.js b/.storybook/preview.js
index 4a74eb33d..fb15f8569 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -38,6 +38,9 @@ addParameters({
       ],
     },
   },
+  controls: {
+    expanded: true,
+  },
 });
 
 export const globalTypes = {

From d7f7d9c7066a0761bffcc9ccc82c9282e0a7fb8a Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Thu, 16 Mar 2023 13:18:00 -0700
Subject: [PATCH 015/129] Box types update (#18160)

---
 .../avatar-base/avatar-base.js                |   6 +-
 .../avatar-favicon/avatar-favicon.js          |   2 +-
 .../avatar-icon/avatar-icon.js                |   4 +-
 .../avatar-network/avatar-network.js          |   6 +-
 .../avatar-token/avatar-token.js              |   6 +-
 .../badge-wrapper/badge-wrapper.stories.tsx   |  33 +-
 .../badge-wrapper/badge-wrapper.types.ts      |   6 +-
 ui/components/ui/box/README.mdx               |  75 ++--
 ui/components/ui/box/box.d.ts                 | 357 ++++++++++++++----
 .../box/{box.stories.js => box.stories.tsx}   | 251 +++++-------
 .../ui/box/{box.test.js => box.test.tsx}      |   0
 ui/components/ui/card/README.mdx              |   8 +-
 ui/components/ui/card/card.js                 |  42 +--
 ui/components/ui/card/card.stories.js         |  11 -
 ui/helpers/constants/design-system.ts         |   1 +
 15 files changed, 463 insertions(+), 345 deletions(-)
 rename ui/components/ui/box/{box.stories.js => box.stories.tsx} (80%)
 rename ui/components/ui/box/{box.test.js => box.test.tsx} (100%)

diff --git a/ui/components/component-library/avatar-base/avatar-base.js b/ui/components/component-library/avatar-base/avatar-base.js
index cbaf77792..8b6da1f0e 100644
--- a/ui/components/component-library/avatar-base/avatar-base.js
+++ b/ui/components/component-library/avatar-base/avatar-base.js
@@ -46,17 +46,17 @@ AvatarBase.propTypes = {
    * The background color of the AvatarBase
    * Defaults to Color.backgroundAlternative
    */
-  backgroundColor: Box.propTypes.backgroundColor,
+  backgroundColor: PropTypes.oneOf(Object.values(BackgroundColor)),
   /**
    * The background color of the AvatarBase
    * Defaults to Color.borderDefault
    */
-  borderColor: Box.propTypes.borderColor,
+  borderColor: PropTypes.oneOf(Object.values(BorderColor)),
   /**
    * The color of the text inside the AvatarBase
    * Defaults to TextColor.textDefault
    */
-  color: Box.propTypes.color,
+  color: PropTypes.oneOf(Object.values(TextColor)),
   /**
    * Additional classNames to be added to the AvatarToken
    */
diff --git a/ui/components/component-library/avatar-favicon/avatar-favicon.js b/ui/components/component-library/avatar-favicon/avatar-favicon.js
index c06b7220f..8400d0dfe 100644
--- a/ui/components/component-library/avatar-favicon/avatar-favicon.js
+++ b/ui/components/component-library/avatar-favicon/avatar-favicon.js
@@ -76,7 +76,7 @@ AvatarFavicon.propTypes = {
    * The border color of the AvatarFavicon
    * Defaults to Color.transparent
    */
-  borderColor: Box.propTypes.borderColor,
+  borderColor: PropTypes.oneOf(Object.values(BorderColor)),
   /**
    * Additional classNames to be added to the AvatarFavicon
    */
diff --git a/ui/components/component-library/avatar-icon/avatar-icon.js b/ui/components/component-library/avatar-icon/avatar-icon.js
index cdb235f3f..415cd1bfa 100644
--- a/ui/components/component-library/avatar-icon/avatar-icon.js
+++ b/ui/components/component-library/avatar-icon/avatar-icon.js
@@ -70,12 +70,12 @@ AvatarIcon.propTypes = {
    * The background color of the AvatarIcon
    * Defaults to BackgroundColor.primaryMuted
    */
-  backgroundColor: Box.propTypes.backgroundColor,
+  backgroundColor: PropTypes.oneOf(Object.values(BackgroundColor)),
   /**
    * The color of the text inside the AvatarIcon
    * Defaults to TextColor.primaryDefault
    */
-  color: Box.propTypes.color,
+  color: PropTypes.oneOf(Object.values(TextColor)),
   /**
    * Additional classNames to be added to the AvatarIcon
    */
diff --git a/ui/components/component-library/avatar-network/avatar-network.js b/ui/components/component-library/avatar-network/avatar-network.js
index 90dbc5d9a..f32001c52 100644
--- a/ui/components/component-library/avatar-network/avatar-network.js
+++ b/ui/components/component-library/avatar-network/avatar-network.js
@@ -102,17 +102,17 @@ AvatarNetwork.propTypes = {
    * The background color of the AvatarNetwork
    * Defaults to BackgroundColor.backgroundAlternative
    */
-  backgroundColor: Box.propTypes.backgroundColor,
+  backgroundColor: PropTypes.oneOf(Object.values(BackgroundColor)),
   /**
    * The background color of the AvatarNetwork
    * Defaults to BorderColor.borderDefault
    */
-  borderColor: Box.propTypes.borderColor,
+  borderColor: PropTypes.oneOf(Object.values(BorderColor)),
   /**
    * The color of the text inside the AvatarNetwork
    * Defaults to TextColor.textDefault
    */
-  color: Box.propTypes.color,
+  color: PropTypes.oneOf(Object.values(TextColor)),
   /**
    * Additional classNames to be added to the AvatarNetwork
    */
diff --git a/ui/components/component-library/avatar-token/avatar-token.js b/ui/components/component-library/avatar-token/avatar-token.js
index ef970c2f5..cd0f47ad4 100644
--- a/ui/components/component-library/avatar-token/avatar-token.js
+++ b/ui/components/component-library/avatar-token/avatar-token.js
@@ -102,17 +102,17 @@ AvatarToken.propTypes = {
    * The background color of the AvatarToken
    * Defaults to Color.backgroundAlternative
    */
-  backgroundColor: Box.propTypes.backgroundColor,
+  backgroundColor: PropTypes.oneOf(Object.values(BackgroundColor)),
   /**
    * The background color of the AvatarToken
    * Defaults to Color.borderDefault
    */
-  borderColor: Box.propTypes.borderColor,
+  borderColor: PropTypes.oneOf(Object.values(BorderColor)),
   /**
    * The color of the text inside the AvatarToken
    * Defaults to Color.textDefault
    */
-  color: Box.propTypes.color,
+  color: PropTypes.oneOf(Object.values(TextColor)),
   /**
    * Additional classNames to be added to the AvatarToken
    */
diff --git a/ui/components/component-library/badge-wrapper/badge-wrapper.stories.tsx b/ui/components/component-library/badge-wrapper/badge-wrapper.stories.tsx
index 6ae9c9dce..e2cf48034 100644
--- a/ui/components/component-library/badge-wrapper/badge-wrapper.stories.tsx
+++ b/ui/components/component-library/badge-wrapper/badge-wrapper.stories.tsx
@@ -3,9 +3,10 @@ import { ComponentStory, ComponentMeta } from '@storybook/react';
 
 import {
   AlignItems,
+  TextColor,
   BorderColor,
   BorderRadius,
-  Color,
+  BackgroundColor,
   DISPLAY,
   IconColor,
   Size,
@@ -155,7 +156,7 @@ export const Badge = () => (
     <BadgeWrapper
       badge={
         <Box
-          backgroundColor={Color.successDefault}
+          backgroundColor={BackgroundColor.successDefault}
           borderRadius={BorderRadius.full}
           borderColor={BorderColor.borderMuted}
           borderWidth={2}
@@ -174,7 +175,7 @@ export const Badge = () => (
       paddingBottom={1}
       paddingRight={1}
       paddingLeft={1}
-      backgroundColor={Color.backgroundAlternative}
+      backgroundColor={BackgroundColor.backgroundAlternative}
       borderRadius={BorderRadius.SM}
       style={{ alignSelf: 'flex-start' }}
     >
@@ -182,8 +183,8 @@ export const Badge = () => (
         badge={
           <Tag
             label="9999"
-            backgroundColor={Color.errorDefault}
-            labelProps={{ color: Color.errorInverse }}
+            backgroundColor={BackgroundColor.errorDefault}
+            labelProps={{ color: TextColor.errorInverse }}
             borderColor={BorderColor.errorDefault}
           />
         }
@@ -196,7 +197,7 @@ export const Badge = () => (
           paddingLeft={8}
           borderRadius={BorderRadius.SM}
           borderColor={BorderColor.borderDefault}
-          backgroundColor={Color.backgroundDefault}
+          backgroundColor={BackgroundColor.backgroundDefault}
         >
           NFTs
         </Box>
@@ -284,14 +285,14 @@ export const AnchorElementShape = () => (
     <BadgeWrapper
       badge={
         <Box
-          backgroundColor={Color.errorDefault}
+          backgroundColor={BackgroundColor.errorDefault}
           borderRadius={BorderRadius.full}
           style={{ width: 16, height: 16 }}
         />
       }
     >
       <Box
-        backgroundColor={Color.infoDefault}
+        backgroundColor={BackgroundColor.infoDefault}
         borderRadius={BorderRadius.full}
         style={{ width: 40, height: 40 }}
       />
@@ -299,14 +300,14 @@ export const AnchorElementShape = () => (
     <BadgeWrapper
       badge={
         <Box
-          backgroundColor={Color.errorDefault}
+          backgroundColor={BackgroundColor.errorDefault}
           borderRadius={BorderRadius.full}
           style={{ width: 8, height: 8 }}
         />
       }
     >
       <Box
-        backgroundColor={Color.infoDefault}
+        backgroundColor={BackgroundColor.infoDefault}
         borderRadius={BorderRadius.full}
         style={{ width: 40, height: 40 }}
       />
@@ -315,14 +316,14 @@ export const AnchorElementShape = () => (
       anchorElementShape={BadgeWrapperAnchorElementShape.rectangular}
       badge={
         <Box
-          backgroundColor={Color.errorDefault}
+          backgroundColor={BackgroundColor.errorDefault}
           borderRadius={BorderRadius.full}
           style={{ width: 16, height: 16 }}
         />
       }
     >
       <Box
-        backgroundColor={Color.infoDefault}
+        backgroundColor={BackgroundColor.infoDefault}
         style={{ width: 40, height: 40 }}
       />
     </BadgeWrapper>
@@ -330,14 +331,14 @@ export const AnchorElementShape = () => (
       anchorElementShape={BadgeWrapperAnchorElementShape.rectangular}
       badge={
         <Box
-          backgroundColor={Color.errorDefault}
+          backgroundColor={BackgroundColor.errorDefault}
           borderRadius={BorderRadius.full}
           style={{ width: 8, height: 8 }}
         />
       }
     >
       <Box
-        backgroundColor={Color.infoDefault}
+        backgroundColor={BackgroundColor.infoDefault}
         style={{ width: 40, height: 40 }}
       />
     </BadgeWrapper>
@@ -345,14 +346,14 @@ export const AnchorElementShape = () => (
       anchorElementShape={BadgeWrapperAnchorElementShape.rectangular}
       badge={
         <Box
-          backgroundColor={Color.errorDefault}
+          backgroundColor={BackgroundColor.errorDefault}
           borderRadius={BorderRadius.full}
           style={{ width: 16, height: 16 }}
         />
       }
     >
       <Box
-        backgroundColor={Color.infoDefault}
+        backgroundColor={BackgroundColor.infoDefault}
         style={{ width: 40, height: 80 }}
       />
     </BadgeWrapper>
diff --git a/ui/components/component-library/badge-wrapper/badge-wrapper.types.ts b/ui/components/component-library/badge-wrapper/badge-wrapper.types.ts
index 223fb3561..3ff416c02 100644
--- a/ui/components/component-library/badge-wrapper/badge-wrapper.types.ts
+++ b/ui/components/component-library/badge-wrapper/badge-wrapper.types.ts
@@ -1,5 +1,3 @@
-import PropTypes from 'prop-types';
-import Box from '../../ui/box';
 import type { BoxProps } from '../../ui/box/box.d';
 
 export enum BadgeWrapperPosition {
@@ -14,9 +12,7 @@ export enum BadgeWrapperAnchorElementShape {
   circular = 'circular',
 }
 
-export interface BadgeWrapperProps
-  extends PropTypes.InferProps<typeof Box.propTypes>,
-    React.HTMLAttributes<HTMLDivElement> {
+export interface BadgeWrapperProps extends BoxProps {
   /**
    * The element to be wrapped by the BadgeWrapper and for the badge to be positioned on top of
    */
diff --git a/ui/components/ui/box/README.mdx b/ui/components/ui/box/README.mdx
index c4a0a2ef6..aa0a4e65f 100644
--- a/ui/components/ui/box/README.mdx
+++ b/ui/components/ui/box/README.mdx
@@ -1,4 +1,4 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+import { Story, Canvas } from '@storybook/addon-docs';
 
 import ActionableMessage from '../actionable-message';
 
@@ -14,43 +14,42 @@ Box is a utility component that can be used for layout or as a base for other UI
 
 ## Props
 
-| Name               | Description                                                                                                               | Default |
-| ------------------ | ------------------------------------------------------------------------------------------------------------------------- | ------- |
-| children           | The children of the Box component. If `function` type will render the child as the Box node instead of a child of the Box | -       |
-| className          | Additional className of the Box component                                                                                 | -       |
-| margin             | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto'] for responsive props                                | -       |
-| marginTop          | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                               | -       |
-| marginBottom       | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                               | -       |
-| marginRight        | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                               | -       |
-| marginLeft         | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                               | -       |
-| marginInline       | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                               | -       |
-| marginInlineStart  | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                               | -       |
-| marginInlineEnd    | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                               | -       |
-| padding            | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                               | -       |
-| paddingTop         | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                               | -       |
-| paddingBottom      | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                               | -       |
-| paddingRight       | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                               | -       |
-| paddingLeft        | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                               | -       |
-| paddingInline      | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                               | -       |
-| paddingInlineStart | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                               | -       |
-| paddingInlineEnd   | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                               | -       |
-
-| display | DISPLAY values or array of DISPLAY values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| flexDirection | FLEX_DIRECTION values or array of FLEX_DIRECTION values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | FLEX_DIRECTION.ROW |
-| flexWrap | FLEX_WRAP values or array of FLEX_WRAP values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| alignItems | AlignItems values or array of AlignItems values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| justifyContent | JustifyContent values or array of JustifyContent values from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| gap | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props | - |
-| textAlign | TEXT_ALIGN values or array of TEXT_ALIGN values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| width | BLOCK_SIZES values or array of BLOCK_SIZES values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| height | BLOCK_SIZES values or array of BLOCK_SIZES values for responsive props [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| color | Color values or array of Color values for responsive props [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| backgroundColor | BackgroundColor values or array of BackgroundColor values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| borderColor | BorderColor values or array of BorderColor values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| borderWidth | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props | - |
-| borderRadius | BorderRadius values or array of BorderRadius values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| borderStyle | BORDER_STYLE values or array of BORDER_STYLE values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | - |
-| as | The polymorphic `as` prop allows you to change the root HTML element of the Box component. Defaults to 'div' | 'div' |
+| Name               | Description                                                                                                                                                                                                                       | Default            |
+| ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| children           | The children of the Box component. If `function` type will render the child as the Box node instead of a child of the Box                                                                                                         | -                  |
+| className          | Additional className of the Box component                                                                                                                                                                                         | -                  |
+| margin             | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto'] for responsive props                                                                                                                                        | -                  |
+| marginTop          | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                                                                                                                                       | -                  |
+| marginBottom       | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                                                                                                                                       | -                  |
+| marginRight        | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                                                                                                                                       | -                  |
+| marginLeft         | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                                                                                                                                       | -                  |
+| marginInline       | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                                                                                                                                       | -                  |
+| marginInlineStart  | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                                                                                                                                       | -                  |
+| marginInlineEnd    | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values for responsive props                                                                                                                                                       | -                  |
+| padding            | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| paddingTop         | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| paddingBottom      | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| paddingRight       | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| paddingLeft        | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| paddingInline      | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| paddingInlineStart | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| paddingInlineEnd   | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| display            | DISPLAY values or array of DISPLAY values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)                 | -                  |
+| flexDirection      | FLEX_DIRECTION values or array of FLEX_DIRECTION values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)   | FLEX_DIRECTION.ROW |
+| flexWrap           | FLEX_WRAP values or array of FLEX_WRAP values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)             | -                  |
+| alignItems         | AlignItems values or array of AlignItems values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)           | -                  |
+| justifyContent     | JustifyContent values or array of JustifyContent values from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)                        | -                  |
+| gap                | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| textAlign          | TEXT_ALIGN values or array of TEXT_ALIGN values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)           | -                  |
+| width              | BLOCK_SIZES values or array of BLOCK_SIZES values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)         | -                  |
+| height             | BLOCK_SIZES values or array of BLOCK_SIZES values for responsive props [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)              | -                  |
+| color              | Color values or array of Color values for responsive props [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)                          | -                  |
+| backgroundColor    | BackgroundColor values or array of BackgroundColor values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js) | -                  |
+| borderColor        | BorderColor values or array of BorderColor values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)         | -                  |
+| borderWidth        | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2] for responsive props                                                                                                                                                       | -                  |
+| borderRadius       | BorderRadius values or array of BorderRadius values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)       | -                  |
+| borderStyle        | BORDER_STYLE values or array of BORDER_STYLE values for responsive props from [../ui/helpers/constants/design-system.js](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js)       | -                  |
+| as                 | The polymorphic `as` prop allows you to change the root HTML element of the Box component. Defaults to 'div'                                                                                                                      | 'div'              |
 
 ## Usage
 
diff --git a/ui/components/ui/box/box.d.ts b/ui/components/ui/box/box.d.ts
index 4c91a50e5..4b40d37c9 100644
--- a/ui/components/ui/box/box.d.ts
+++ b/ui/components/ui/box/box.d.ts
@@ -18,53 +18,45 @@ import {
 
 export type BoxChildren = React.ReactNode | ((...args: any[]) => any);
 
-export type BoxFlexDirection = typeof FLEX_DIRECTION;
+export type BoxFlexDirection =
+  | typeof FLEX_DIRECTION[keyof typeof FLEX_DIRECTION]
+  | null;
 export type BoxFlexDirectionArray = [
-  BoxFlexDirection[keyof BoxFlexDirection],
-  BoxFlexDirection[keyof BoxFlexDirection]?,
-  BoxFlexDirection[keyof BoxFlexDirection]?,
-  BoxFlexDirection[keyof BoxFlexDirection]?,
+  BoxFlexDirection,
+  BoxFlexDirection?,
+  BoxFlexDirection?,
+  BoxFlexDirection?,
 ];
 
-export type BoxFlexWrap = typeof FLEX_WRAP;
+export type BoxFlexWrap = typeof FLEX_WRAP[keyof typeof FLEX_WRAP] | null;
 export type BoxFlexWrapArray = [
-  BoxFlexWrap[keyof BoxFlexWrap],
-  BoxFlexWrap[keyof BoxFlexWrap]?,
-  BoxFlexWrap[keyof BoxFlexWrap]?,
-  BoxFlexWrap[keyof BoxFlexWrap]?,
+  BoxFlexWrap,
+  BoxFlexWrap?,
+  BoxFlexWrap?,
+  BoxFlexWrap?,
 ];
 
-export type BoxTextAlign = typeof TEXT_ALIGN;
+export type BoxTextAlign = typeof TEXT_ALIGN[keyof typeof TEXT_ALIGN] | null;
 export type BoxTextAlignArray = [
-  BoxTextAlign[keyof BoxTextAlign],
-  BoxTextAlign[keyof BoxTextAlign]?,
-  BoxTextAlign[keyof BoxTextAlign]?,
-  BoxTextAlign[keyof BoxTextAlign]?,
+  BoxTextAlign,
+  BoxTextAlign?,
+  BoxTextAlign?,
+  BoxTextAlign?,
 ];
 
-export type BoxDisplay = typeof DISPLAY;
+export type BoxDisplay = typeof DISPLAY[keyof typeof DISPLAY] | null;
 export type BoxDisplayArray = [
-  BoxDisplay[keyof BoxDisplay],
-  BoxDisplay[keyof BoxDisplay]?,
-  BoxDisplay[keyof BoxDisplay]?,
-  BoxDisplay[keyof BoxDisplay]?,
+  BoxDisplay,
+  BoxDisplay?,
+  BoxDisplay?,
+  BoxDisplay?,
 ];
 
-export type BoxWidth = typeof BLOCK_SIZES;
-export type BoxWidthArray = [
-  BoxWidth[keyof BoxWidth],
-  BoxWidth[keyof BoxWidth]?,
-  BoxWidth[keyof BoxWidth]?,
-  BoxWidth[keyof BoxWidth]?,
-];
+export type BoxWidth = typeof BLOCK_SIZES[keyof typeof BLOCK_SIZES] | null;
+export type BoxWidthArray = [BoxWidth, BoxWidth?, BoxWidth?, BoxWidth?];
 
-export type BoxHeight = typeof BLOCK_SIZES;
-export type BoxHeightArray = [
-  BoxHeight[keyof BoxHeight],
-  BoxHeight[keyof BoxHeight]?,
-  BoxHeight[keyof BoxHeight]?,
-  BoxHeight[keyof BoxHeight]?,
-];
+export type BoxHeight = typeof BLOCK_SIZES[keyof typeof BLOCK_SIZES] | null;
+export type BoxHeightArray = [BoxHeight, BoxHeight?, BoxHeight?, BoxHeight?];
 
 export type SizeNumber =
   | 0
@@ -80,51 +72,272 @@ export type SizeNumber =
   | 10
   | 11
   | 12
-  | null
-  | undefined;
+  | null;
 
-export type Size =
-  | SizeNumber
-  | [SizeNumber, SizeNumber?, SizeNumber?, SizeNumber?];
+export type SizeNumberArray = [
+  SizeNumber,
+  SizeNumber?,
+  SizeNumber?,
+  SizeNumber?,
+];
 
-export interface BoxProps {
+export type SizeNumberAndAuto = SizeNumber | 'auto';
+export type SizeNumberAndAutoArray = [
+  SizeNumberAndAuto,
+  SizeNumberAndAuto?,
+  SizeNumberAndAuto?,
+  SizeNumberAndAuto?,
+];
+
+export type BorderColorArray = [
+  BorderColor,
+  BorderColor?,
+  BorderColor?,
+  BorderColor?,
+];
+
+export type BorderRadiusArray = [
+  BorderRadius,
+  BorderRadius?,
+  BorderRadius?,
+  BorderRadius?,
+];
+
+export type BorderStyleArray = [
+  BorderStyle,
+  BorderStyle?,
+  BorderStyle?,
+  BorderStyle?,
+];
+
+export type AlignItemsArray = [
+  AlignItems,
+  AlignItems?,
+  AlignItems?,
+  AlignItems?,
+];
+
+export type JustifyContentArray = [
+  JustifyContent,
+  JustifyContent?,
+  JustifyContent?,
+  JustifyContent?,
+];
+
+export type BackgroundColorArray = [
+  BackgroundColor,
+  BackgroundColor?,
+  BackgroundColor?,
+  BackgroundColor?,
+];
+
+export interface BoxProps extends React.HTMLAttributes<HTMLElement> {
+  /**
+   * The content of the Box component.
+   */
   children?: React.ReactNode;
-  flexDirection?:
-    | BoxFlexDirection[keyof BoxFlexDirection]
-    | BoxFlexDirectionArray;
-  flexWrap?: BoxFlexWrap[keyof BoxFlexWrap] | BoxFlexWrapArray;
-  gap?: Size;
-  margin?: Size;
-  marginTop?: Size;
-  marginBottom?: Size;
-  marginRight?: Size;
-  marginLeft?: Size;
-  marginInline?: Size;
-  marginInlineStart?: Size;
-  marginInlineEnd?: Size;
-  padding?: Size;
-  paddingTop?: Size;
-  paddingBottom?: Size;
-  paddingRight?: Size;
-  paddingLeft?: Size;
-  paddingInline?: Size;
-  paddingInlineStart?: Size;
-  paddingInlineEnd?: Size;
-  borderColor?: BorderColor;
-  borderWidth?: Size;
-  borderRadius?: BorderRadius;
-  borderStyle?: BorderStyle;
-  alignItems?: AlignItems;
-  justifyContent?: JustifyContent;
-  textAlign?: BoxTextAlign[keyof BoxTextAlign] | BoxTextAlignArray;
-  display?: BoxDisplay[keyof BoxDisplay] | BoxDisplayArray;
-  width?: BoxWidth[keyof BoxWidth] | BoxWidthArray;
-  height?: BoxHeight[keyof BoxHeight] | BoxHeightArray;
-  backgroundColor?: BackgroundColor;
+  /**
+   * The flex direction of the Box component.
+   * Use the FLEX_DIRECTION object from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  flexDirection?: BoxFlexDirection | BoxFlexDirectionArray;
+  /**
+   * The flex wrap of the Box component.
+   * Use the FLEX_WRAP object from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  flexWrap?: BoxFlexWrap | BoxFlexWrapArray;
+  /**
+   * The gap between the Box component's children.
+   * Use 1-12 for a gap of 4px-48px.
+   * Accepts responsive props in the form of an array.
+   */
+  gap?: SizeNumber | SizeNumberArray | undefined;
+  /**
+   * The margin of the Box component.
+   * Use 1-12 for 4px-48px or 'auto'.
+   * Accepts responsive props in the form of an array.
+   */
+  margin?: SizeNumberAndAuto | SizeNumberAndAutoArray;
+  /**
+   * The margin-top of the Box component.
+   * Use 1-12 for 4px-48px or 'auto'.
+   * Accepts responsive props in the form of an array.
+   */
+  marginTop?: SizeNumberAndAuto | SizeNumberAndAutoArray;
+  /**
+   * The margin-bottom of the Box component.
+   * Use 1-12 for 4px-48px or 'auto'.
+   * Accepts responsive props in the form of an array.
+   */
+  marginBottom?: SizeNumberAndAuto | SizeNumberAndAutoArray;
+  /**
+   * The margin-right of the Box component.
+   * Use 1-12 for 4px-48px or 'auto'.
+   * Accepts responsive props in the form of an array.
+   */
+  marginRight?: SizeNumberAndAuto | SizeNumberAndAutoArray;
+  /**
+   * The margin-left of the Box component.
+   * Use 1-12 for 4px-48px or 'auto'.
+   * Accepts responsive props in the form of an array.
+   */
+  marginLeft?: SizeNumberAndAuto | SizeNumberAndAutoArray;
+  /**
+   * The margin-inline of the Box component.
+   * Use 1-12 for 4px-48px or 'auto'.
+   * Accepts responsive props in the form of an array.
+   */
+  marginInline?: SizeNumberAndAuto | SizeNumberAndAutoArray;
+  /**
+   * The margin-inline-start of the Box component.
+   * Use 1-12 for 4px-48px or 'auto'.
+   * Accepts responsive props in the form of an array.
+   */
+  marginInlineStart?: SizeNumberAndAuto | SizeNumberAndAutoArray;
+  /**
+   * The margin-inline-end of the Box component.
+   * Use 1-12 for 4px-48px or 'auto'.
+   * Accepts responsive props in the form of an array.
+   */
+  marginInlineEnd?: SizeNumberAndAuto | SizeNumberAndAutoArray;
+  /**
+   * The padding of the Box component.
+   * Use 1-12 for 4px-48px.
+   * Accepts responsive props in the form of an array.
+   */
+  padding?: SizeNumber | SizeNumberArray;
+  /**
+   * The padding-top of the Box component.
+   * Use 1-12 for 4px-48px.
+   * Accepts responsive props in the form of an array.
+   */
+  paddingTop?: SizeNumber | SizeNumberArray;
+  /**
+   * The padding-bottom of the Box component.
+   * Use 1-12 for 4px-48px.
+   * Accepts responsive props in the form of an array.
+   */
+  paddingBottom?: SizeNumber | SizeNumberArray;
+  /**
+   * The padding-right of the Box component.
+   * Use 1-12 for 4px-48px.
+   * Accepts responsive props in the form of an array.
+   */
+  paddingRight?: SizeNumber | SizeNumberArray;
+  /**
+   * The padding-left of the Box component.
+   * Use 1-12 for 4px-48px.
+   * Accepts responsive props in the form of an array.
+   */
+  paddingLeft?: SizeNumber | SizeNumberArray;
+  /**
+   * The padding-inline of the Box component.
+   * Use 1-12 for 4px-48px.
+   * Accepts responsive props in the form of an array.
+   */
+  paddingInline?: SizeNumber | SizeNumberArray;
+  /**
+   * The padding-inline-start of the Box component.
+   * Use 1-12 for 4px-48px.
+   * Accepts responsive props in the form of an array.
+   */
+  paddingInlineStart?: SizeNumber | SizeNumberArray;
+  /**
+   * The padding-inline-end of the Box component.
+   * Use 1-12 for 4px-48px.
+   * Accepts responsive props in the form of an array.
+   */
+  paddingInlineEnd?: SizeNumber | SizeNumberArray;
+  /**
+   * The border-color of the Box component.
+   * Use BorderColor enum from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  borderColor?: BorderColor | BorderColorArray;
+  /**
+   * The border-width of the Box component.
+   * Use 1-12 for 1px-12px.
+   * Accepts responsive props in the form of an array.
+   */
+  borderWidth?: SizeNumber | SizeNumberArray;
+  /**
+   * The border-radius of the Box component.
+   * Use BorderRadius enum from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  borderRadius?: BorderRadius | BorderRadiusArray;
+  /**
+   * The border-style of the Box component.
+   * Use BorderStyle enum from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  borderStyle?: BorderStyle | BorderStyleArray;
+  /**
+   * The align-items of the Box component.
+   * Use AlignItems enum from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  alignItems?: AlignItems | AlignItemsArray;
+  /**
+   * The justify-content of the Box component.
+   * Use JustifyContent enum from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  justifyContent?: JustifyContent | JustifyContentArray;
+  /**
+   * The text-align of the Box component.
+   * Use TEXT_ALIGN const from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  textAlign?: BoxTextAlign | BoxTextAlignArray;
+  /**
+   * The display of the Box component.
+   * Use DISPLAY const from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  display?: BoxDisplay | BoxDisplayArray;
+  /**
+   * The width of the Box component.
+   * Use BLOCK_SIZES const from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  width?: BoxWidth | BoxWidthArray;
+  /**
+   * The height of the Box component.
+   * Use BLOCK_SIZES const from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  height?: BoxHeight | BoxHeightArray;
+  /**
+   * The background-color of the Box component.
+   * Use BackgroundColor enum from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
+  backgroundColor?: BackgroundColor | BackgroundColorArray;
+  /**
+   * Use the className prop to add an additional custom class to the Box component.
+   */
   className?: string;
+  /**
+   * Use the style prop to add an additional custom style to the Box component.
+   */
   style?: React.CSSProperties;
+  /**
+   * Use the as prop to change the underlying HTML element of the Box component.
+   */
   as?: keyof HTMLElementTagNameMap;
+  /**
+   * The text-color of the Box component.
+   * Use TextColor enum from '../../../helpers/constants/design-system';
+   * Accepts responsive props in the form of an array.
+   */
   color?: TextColor | IconColor | string; // TODO: remove string when someone smarter figures out the issue with the color prop
+  /**
+   * The ref of the Box component.
+   */
+  ref?: React.RefObject<HTMLElement>;
 }
 
 declare const Box: React.FC<BoxProps>;
diff --git a/ui/components/ui/box/box.stories.js b/ui/components/ui/box/box.stories.tsx
similarity index 80%
rename from ui/components/ui/box/box.stories.js
rename to ui/components/ui/box/box.stories.tsx
index 3fb8dfc31..7dff8d94a 100644
--- a/ui/components/ui/box/box.stories.js
+++ b/ui/components/ui/box/box.stories.tsx
@@ -1,4 +1,6 @@
 import React from 'react';
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+
 import {
   BLOCK_SIZES,
   BorderStyle,
@@ -12,10 +14,9 @@ import {
   TEXT_ALIGN,
   FLEX_DIRECTION,
   FLEX_WRAP,
-  Color,
 } from '../../../helpers/constants/design-system';
 
-import Typography from '../typography';
+import { Text } from '../../component-library';
 
 import Box from './box';
 
@@ -41,7 +42,6 @@ const marginSizeControlOptions = [...sizeControlOptions, 'auto'];
 
 export default {
   title: 'Components/UI/Box',
-
   component: Box,
   parameters: {
     docs: {
@@ -52,14 +52,6 @@ export default {
     children: {
       table: { category: 'children' },
     },
-    size: {
-      control: { type: 'range', min: 50, max: 500, step: 10 },
-      table: { category: 'children' },
-    },
-    items: {
-      control: 'number',
-      table: { category: 'children' },
-    },
     display: {
       options: Object.values(DISPLAY),
       control: 'select',
@@ -223,45 +215,26 @@ export default {
       table: { category: 'as (root html element)' },
     },
   },
-  args: {
-    size: 100,
-    items: 1,
-    display: DISPLAY.BLOCK,
-    width: BLOCK_SIZES.HALF,
-    height: BLOCK_SIZES.HALF,
-    borderStyle: BorderStyle.dashed,
-    borderColor: BorderColor.borderDefault,
-    justifyContent: JustifyContent.flexStart,
-    alignItems: AlignItems.flexStart,
-    textAlign: TEXT_ALIGN.LEFT,
-  },
-};
+} as ComponentMeta<typeof Box>;
 
-export const DefaultStory = (args) => {
-  const { items, size, ...rest } = args;
-  const children = [];
-  for (let $i = 0; $i < items; $i++) {
-    children.push(
-      <Box
-        as="img"
-        backgroundColor={BackgroundColor.backgroundAlternative}
-        borderColor={BorderColor.borderMuted}
-        key={$i}
-        style={{ width: size, height: size }}
-        src="./images/eth_logo.svg"
-      />,
-    );
-  }
-  return (
-    <Box {...rest} borderColor={BorderColor.borderMuted}>
-      {children}
-    </Box>
-  );
+export const DefaultStory: ComponentStory<typeof Box> = (args) => (
+  <Box {...args} />
+);
+
+DefaultStory.args = {
+  children: 'Box component',
+  display: DISPLAY.FLEX,
+  justifyContent: JustifyContent.center,
+  alignItems: AlignItems.center,
+  width: BLOCK_SIZES.HALF,
+  height: BLOCK_SIZES.HALF,
+  borderColor: BorderColor.borderDefault,
+  padding: 4,
 };
 
 DefaultStory.storyName = 'Default';
 
-export const Margin = (args) => {
+export const Margin: ComponentStory<typeof Box> = (args) => {
   return (
     <Box borderColor={BorderColor.borderMuted}>
       <Box
@@ -286,7 +259,7 @@ export const Margin = (args) => {
   );
 };
 
-export const Padding = (args) => {
+export const Padding: ComponentStory<typeof Box> = (args) => {
   return (
     <Box borderColor={BorderColor.borderMuted}>
       <Box
@@ -309,91 +282,91 @@ export const Padding = (args) => {
   );
 };
 
-export const ColorStory = (args) => {
+export const ColorStory: ComponentStory<typeof Box> = (args) => {
   return (
     <>
-      <Box {...args} padding={3} color={Color.textDefault}>
-        Color.textDefault
+      <Box {...args} padding={3} color={TextColor.textDefault}>
+        TextColor.textDefault
       </Box>
-      <Box {...args} padding={3} color={Color.textAlternative}>
-        Color.textAlternative
+      <Box {...args} padding={3} color={TextColor.textAlternative}>
+        TextColor.textAlternative
       </Box>
-      <Box {...args} padding={3} color={Color.textMuted}>
-        Color.textMuted
+      <Box {...args} padding={3} color={TextColor.textMuted}>
+        TextColor.textMuted
       </Box>
-      <Box {...args} padding={3} color={Color.primaryDefault}>
-        Color.primaryDefault
+      <Box {...args} padding={3} color={TextColor.primaryDefault}>
+        TextColor.primaryDefault
       </Box>
       <Box
         {...args}
         padding={3}
-        color={Color.primaryInverse}
+        color={TextColor.primaryInverse}
         backgroundColor={BackgroundColor.primaryDefault}
       >
-        Color.primaryInverse
+        TextColor.primaryInverse
       </Box>
-      <Box {...args} padding={3} color={Color.errorDefault}>
-        Color.errorDefault
+      <Box {...args} padding={3} color={TextColor.errorDefault}>
+        TextColor.errorDefault
       </Box>
       <Box
         {...args}
         padding={3}
-        color={Color.errorInverse}
+        color={TextColor.errorInverse}
         backgroundColor={BackgroundColor.errorDefault}
       >
-        Color.errorInverse
+        TextColor.errorInverse
       </Box>
-      <Box {...args} padding={3} color={Color.successDefault}>
-        Color.successDefault
+      <Box {...args} padding={3} color={TextColor.successDefault}>
+        TextColor.successDefault
       </Box>
       <Box
         {...args}
         padding={3}
-        color={Color.successInverse}
+        color={TextColor.successInverse}
         backgroundColor={BackgroundColor.successDefault}
       >
-        Color.successInverse
+        TextColor.successInverse
       </Box>
-      <Box {...args} padding={3} color={Color.warningDefault}>
-        Color.warningDefault
+      <Box {...args} padding={3} color={TextColor.warningDefault}>
+        TextColor.warningDefault
       </Box>
       <Box
         {...args}
         padding={3}
-        color={Color.warningInverse}
+        color={TextColor.warningInverse}
         backgroundColor={BackgroundColor.warningDefault}
       >
-        Color.warningInverse
+        TextColor.warningInverse
       </Box>
-      <Box {...args} padding={3} color={Color.infoDefault}>
-        Color.infoDefault
+      <Box {...args} padding={3} color={TextColor.infoDefault}>
+        TextColor.infoDefault
       </Box>
       <Box
         {...args}
         padding={3}
-        color={Color.infoInverse}
+        color={TextColor.infoInverse}
         backgroundColor={BackgroundColor.infoDefault}
       >
-        Color.infoInverse
+        TextColor.infoInverse
       </Box>
-      <Box {...args} padding={3} color={Color.inherit}>
-        Color.inherit
+      <Box {...args} padding={3} color={TextColor.inherit}>
+        TextColor.inherit
       </Box>
       <Box
         {...args}
         padding={3}
-        backgroundColor={Color.sepolia}
-        color={Color.sepoliaInverse}
+        backgroundColor={BackgroundColor.sepolia}
+        color={TextColor.sepoliaInverse}
       >
-        Color.sepoliaInverse
+        TextColor.sepoliaInverse
       </Box>
       <Box
         {...args}
         padding={3}
-        backgroundColor={Color.goerli}
-        color={Color.goerliInverse}
+        backgroundColor={BackgroundColor.goerli}
+        color={TextColor.goerliInverse}
       >
-        Color.goerliInverse
+        TextColor.goerliInverse
       </Box>
     </>
   );
@@ -404,69 +377,55 @@ export const BackgroundColorStory = () => {
   return (
     <>
       <Box padding={3} backgroundColor={BackgroundColor.backgroundDefault}>
-        <Typography color={TextColor.textDefault}>
+        <Text color={TextColor.textDefault}>
           BackgroundColor.backgroundDefault
-        </Typography>
+        </Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.backgroundAlternative}>
-        <Typography color={TextColor.textDefault}>
+        <Text color={TextColor.textDefault}>
           BackgroundColor.backgroundAlternative
-        </Typography>
+        </Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.overlayDefault}>
-        <Typography color={TextColor.overlayInverse}>
+        <Text color={TextColor.overlayInverse}>
           BackgroundColor.overlayDefault
-        </Typography>
+        </Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.primaryDefault}>
-        <Typography color={Color.primaryInverse}>
+        <Text color={TextColor.primaryInverse}>
           BackgroundColor.primaryDefault
-        </Typography>
+        </Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.primaryMuted}>
-        <Typography color={TextColor.textDefault}>
-          BackgroundColor.primaryMuted
-        </Typography>
+        <Text color={TextColor.textDefault}>BackgroundColor.primaryMuted</Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.errorDefault}>
-        <Typography color={TextColor.errorInverse}>
-          BackgroundColor.errorDefault
-        </Typography>
+        <Text color={TextColor.errorInverse}>BackgroundColor.errorDefault</Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.errorMuted}>
-        <Typography color={TextColor.textDefault}>
-          BackgroundColor.errorMuted
-        </Typography>
+        <Text color={TextColor.textDefault}>BackgroundColor.errorMuted</Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.successDefault}>
-        <Typography color={TextColor.successInverse}>
+        <Text color={TextColor.successInverse}>
           BackgroundColor.successDefault
-        </Typography>
+        </Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.successMuted}>
-        <Typography color={TextColor.textDefault}>
-          BackgroundColor.successMuted
-        </Typography>
+        <Text color={TextColor.textDefault}>BackgroundColor.successMuted</Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.warningDefault}>
-        <Typography color={TextColor.warningInverse}>
+        <Text color={TextColor.warningInverse}>
           BackgroundColor.warningDefault
-        </Typography>
+        </Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.warningMuted}>
-        <Typography color={TextColor.textDefault}>
-          BackgroundColor.warningMuted
-        </Typography>
+        <Text color={TextColor.textDefault}>BackgroundColor.warningMuted</Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.sepolia}>
-        <Typography color={TextColor.sepoliaInverse}>
-          BackgroundColor.sepolia
-        </Typography>
+        <Text color={TextColor.sepoliaInverse}>BackgroundColor.sepolia</Text>
       </Box>
       <Box padding={3} backgroundColor={BackgroundColor.goerli}>
-        <Typography color={TextColor.goerliInverse}>
-          BackgroundColor.goerli
-        </Typography>
+        <Text color={TextColor.goerliInverse}>BackgroundColor.goerli</Text>
       </Box>
     </>
   );
@@ -483,9 +442,7 @@ export const BorderColorStory = () => {
         borderWidth={2}
         marginBottom={1}
       >
-        <Typography color={TextColor.textDefault}>
-          BorderColor.borderDefault
-        </Typography>
+        <Text color={TextColor.textDefault}>BorderColor.borderDefault</Text>
       </Box>
       <Box
         padding={3}
@@ -494,9 +451,7 @@ export const BorderColorStory = () => {
         borderWidth={2}
         marginBottom={1}
       >
-        <Typography color={TextColor.textDefault}>
-          BorderColor.borderMuted
-        </Typography>
+        <Text color={TextColor.textDefault}>BorderColor.borderMuted</Text>
       </Box>
       <Box
         padding={3}
@@ -505,9 +460,7 @@ export const BorderColorStory = () => {
         marginBottom={1}
         backgroundColor={BackgroundColor.primaryMuted}
       >
-        <Typography color={TextColor.textDefault}>
-          BorderColor.primaryDefault
-        </Typography>
+        <Text color={TextColor.textDefault}>BorderColor.primaryDefault</Text>
       </Box>
       <Box
         padding={3}
@@ -516,9 +469,7 @@ export const BorderColorStory = () => {
         borderWidth={2}
         marginBottom={1}
       >
-        <Typography color={TextColor.textDefault}>
-          BorderColor.errorDefault
-        </Typography>
+        <Text color={TextColor.textDefault}>BorderColor.errorDefault</Text>
       </Box>
       <Box
         padding={3}
@@ -527,9 +478,7 @@ export const BorderColorStory = () => {
         borderWidth={2}
         marginBottom={1}
       >
-        <Typography color={TextColor.textDefault}>
-          BorderColor.successDefault
-        </Typography>
+        <Text color={TextColor.textDefault}>BorderColor.successDefault</Text>
       </Box>
       <Box
         padding={3}
@@ -537,9 +486,7 @@ export const BorderColorStory = () => {
         borderColor={BorderColor.warningDefault}
         borderWidth={2}
       >
-        <Typography color={TextColor.textDefault}>
-          BorderColor.warningDefault
-        </Typography>
+        <Text color={TextColor.textDefault}>BorderColor.warningDefault</Text>
       </Box>
     </>
   );
@@ -639,11 +586,11 @@ BorderRadiusStory.storyName = 'BorderRadius';
 export const ResponsiveProps = () => {
   return (
     <>
-      <Typography boxProps={{ marginBottom: 4 }}>
+      <Text marginBottom={4}>
         Responsive props example. Stacks vertically on small screens and aligns
         horizontally on large screens. Padding is also adjusted between small
         and large screens
-      </Typography>
+      </Text>
       <Box
         marginTop="auto"
         marginBottom={[0]}
@@ -695,7 +642,7 @@ export const ResponsiveProps = () => {
           padding={[4, 8]}
           borderRadius={[
             BorderRadius.XL,
-            BorderRadius.PILL,
+            BorderRadius.pill,
             BorderRadius.none,
             BorderRadius.full,
           ]}
@@ -709,13 +656,13 @@ export const ResponsiveProps = () => {
   );
 };
 
-export const As = (args) => {
+export const As: ComponentStory<typeof Box> = (args) => {
   return (
     <>
-      <Typography marginBottom={4}>
+      <Text marginBottom={4}>
         You can change the root element of the Box component using the as prop.
         Inspect the below elements to see the underlying HTML elements
-      </Typography>
+      </Text>
       <Box {...args}>div(default)</Box>
       <Box as="ul">ul</Box>
       <Box as="li">li</Box>
@@ -725,9 +672,9 @@ export const As = (args) => {
   );
 };
 
-export const Width = (args) => {
-  const getColumns = () => {
-    const content = [];
+export const Width: ComponentStory<typeof Box> = () => {
+  const getColumns = (): JSX.Element[] => {
+    const content: JSX.Element[] = [];
     for (let i = 0; i < 12; i++) {
       content.push(
         <Box
@@ -746,30 +693,12 @@ export const Width = (args) => {
 
   return (
     <>
-      <p>
-        <b>Working demo</b>
-      </p>
-
-      <Box
-        borderColor={BorderColor.borderMuted}
-        borderWidth={6}
-        marginBottom={6}
-        display={DISPLAY.FLEX}
-        alignItems={AlignItems.center}
-        justifyContent={JustifyContent.center}
-        {...args}
-      >
-        {args.width.map((item, i) => {
-          return `${item} ${args.width.length === i + 1 ? '' : ', '}`;
-        })}
-      </Box>
-
       <p>
         <b>Static widths</b>
       </p>
       <Box
         display={DISPLAY.FLEX}
-        borderColor={BackgroundColor.backgroundAlternative}
+        borderColor={BorderColor.borderMuted}
         style={{
           height: '100vh',
           position: 'relative',
@@ -903,7 +832,7 @@ export const Width = (args) => {
       </p>
       <Box
         display={DISPLAY.FLEX}
-        borderColor={BackgroundColor.backgroundAlternative}
+        borderColor={BorderColor.borderMuted}
         style={{ height: '100vh', position: 'relative', textAlign: 'center' }}
       >
         {getColumns()}
diff --git a/ui/components/ui/box/box.test.js b/ui/components/ui/box/box.test.tsx
similarity index 100%
rename from ui/components/ui/box/box.test.js
rename to ui/components/ui/box/box.test.tsx
diff --git a/ui/components/ui/card/README.mdx b/ui/components/ui/card/README.mdx
index abb651155..a18a4066d 100644
--- a/ui/components/ui/card/README.mdx
+++ b/ui/components/ui/card/README.mdx
@@ -27,16 +27,20 @@ The Card component has a set of default props that should meet most card use cas
 That being said all props can be overwritten if necessary.
 
 ```jsx
-import { Color } from '../../../helpers/constants/design-system';
+import { BackgroundColor, BorderColor, BorderRadius, BorderStyle } from '../../../helpers/constants/design-system';
 
 // To remove the border
 <Card border={false} />
 // All border related props of the Box component will work
+<Card borderColor={BorderColor.primary} />
+<Card borderRadius={BorderRadius.LG}>
+<Card borderStyle={BorderStyle.dashed}>
 
 // To remove or change padding
 <Card padding={0} />
 // All padding related props of the Box component will work
+<Card paddingTop={4} paddingBottom={4} paddingLeft={8} paddingRight={8} />
 
 // To change the background color
-<Card backgroundColor={Color.backgroundAlternative} />
+<Card backgroundColor={BackgroundColor.backgroundAlternative} />
 ```
diff --git a/ui/components/ui/card/card.js b/ui/components/ui/card/card.js
index cbff9dcc2..cf0eb64d2 100644
--- a/ui/components/ui/card/card.js
+++ b/ui/components/ui/card/card.js
@@ -5,36 +5,27 @@ import Box from '../box';
 import {
   BackgroundColor,
   BorderColor,
+  BorderRadius,
   BorderStyle,
-  Size,
 } from '../../../helpers/constants/design-system';
 
 const Card = ({
   border = true,
-  padding = 4,
   backgroundColor = BackgroundColor.backgroundDefault,
   children,
   ...props
-}) => {
-  const defaultBorderProps = {
-    borderColor: border && BorderColor.borderMuted,
-    borderRadius: border && Size.MD,
-    borderStyle: border && BorderStyle.solid,
-  };
-
-  return (
-    <Box
-      {...{
-        padding,
-        backgroundColor,
-        ...defaultBorderProps,
-        ...props,
-      }}
-    >
-      {children}
-    </Box>
-  );
-};
+}) => (
+  <Box
+    borderColor={border ? BorderColor.borderMuted : null}
+    borderRadius={border ? BorderRadius.MD : null}
+    borderStyle={border ? BorderStyle.solid : null}
+    backgroundColor={backgroundColor}
+    padding={4}
+    {...props}
+  >
+    {children}
+  </Box>
+);
 
 Card.propTypes = {
   /**
@@ -42,16 +33,11 @@ Card.propTypes = {
    * Defaults to true
    */
   border: PropTypes.bool,
-  /**
-   * Padding of the Card component accepts number or an array of 2 numbers.
-   * Defaults to 4 (16px)
-   */
-  padding: Box.propTypes.padding,
   /**
    * The background color of the card
    * Defaults to Color.backgroundDefault
    */
-  backgroundColor: Box.propTypes.backgroundColor,
+  backgroundColor: PropTypes.oneOf(Object.values(BackgroundColor)),
   /**
    * The Card component accepts all Box component props
    */
diff --git a/ui/components/ui/card/card.stories.js b/ui/components/ui/card/card.stories.js
index 9c5cef1c0..0be9c02a2 100644
--- a/ui/components/ui/card/card.stories.js
+++ b/ui/components/ui/card/card.stories.js
@@ -17,7 +17,6 @@ const sizeOptions = [undefined, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 
 export default {
   title: 'Components/UI/Card',
-
   component: Card,
   parameters: {
     docs: {
@@ -158,13 +157,3 @@ export default {
 export const DefaultStory = (args) => <Card {...args}>{args.children}</Card>;
 
 DefaultStory.storyName = 'Default';
-
-DefaultStory.args = {
-  padding: 4,
-  border: true,
-  borderWidth: 1,
-  borderColor: BorderColor.borderDefault,
-  borderStyle: BorderStyle.solid,
-  backgroundColor: BackgroundColor.backgroundDefault,
-  display: DISPLAY.BLOCK,
-};
diff --git a/ui/helpers/constants/design-system.ts b/ui/helpers/constants/design-system.ts
index a73831274..3ac409fef 100644
--- a/ui/helpers/constants/design-system.ts
+++ b/ui/helpers/constants/design-system.ts
@@ -108,6 +108,7 @@ export enum TextColor {
   textDefault = 'text-default',
   textAlternative = 'text-alternative',
   textMuted = 'text-muted',
+  overlayInverse = 'overlay-inverse',
   primaryDefault = 'primary-default',
   primaryInverse = 'primary-inverse',
   errorDefault = 'error-default',

From d45c4ed4973b3f6876007d618e4ced0a5a201ac4 Mon Sep 17 00:00:00 2001
From: Alex Donesky <adonesky@gmail.com>
Date: Thu, 16 Mar 2023 15:53:29 -0500
Subject: [PATCH 016/129] make network-controller methods overwrite rather than
 merge provider state (#18127)

* make network-controller methods overwrite rather than merge provider state
---
 app/scripts/controllers/network/network-controller.js  | 10 +++++-----
 .../controllers/network/network-controller.test.js     |  9 +++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/scripts/controllers/network/network-controller.js b/app/scripts/controllers/network/network-controller.js
index 6f0e08cbe..20869f227 100644
--- a/app/scripts/controllers/network/network-controller.js
+++ b/app/scripts/controllers/network/network-controller.js
@@ -289,7 +289,7 @@ export default class NetworkController extends EventEmitter {
 
   rollbackToPreviousProvider() {
     const config = this.previousProviderStore.getState();
-    this.providerStore.updateState(config);
+    this.providerStore.putState(config);
     this._switchNetwork(config);
   }
 
@@ -347,7 +347,7 @@ export default class NetworkController extends EventEmitter {
    * @param {boolean} isSupported - True if the EIP is supported
    */
   _setNetworkEIPSupport(EIPNumber, isSupported) {
-    this.networkDetails.updateState({
+    this.networkDetails.putState({
       EIPS: {
         [EIPNumber]: isSupported,
       },
@@ -367,8 +367,8 @@ export default class NetworkController extends EventEmitter {
    * @param config
    */
   _setProviderConfig(config) {
-    this.previousProviderStore.updateState(this.providerStore.getState());
-    this.providerStore.updateState(config);
+    this.previousProviderStore.putState(this.providerStore.getState());
+    this.providerStore.putState(config);
     this._switchNetwork(config);
   }
 
@@ -550,7 +550,7 @@ export default class NetworkController extends EventEmitter {
     )?.id;
 
     const newNetworkConfigurationId = oldNetworkConfigurationId || random();
-    this.networkConfigurationsStore.updateState({
+    this.networkConfigurationsStore.putState({
       ...networkConfigurations,
       [newNetworkConfigurationId]: {
         ...newNetworkConfiguration,
diff --git a/app/scripts/controllers/network/network-controller.test.js b/app/scripts/controllers/network/network-controller.test.js
index 8c887cb56..a3743ae56 100644
--- a/app/scripts/controllers/network/network-controller.test.js
+++ b/app/scripts/controllers/network/network-controller.test.js
@@ -3218,7 +3218,6 @@ describe('NetworkController', () => {
                   blockExplorerUrl:
                     BUILT_IN_NETWORKS[networkType].blockExplorerUrl,
                 },
-                id: 'testNetworkConfigurationId2',
               });
             },
           );
@@ -4213,7 +4212,7 @@ describe('NetworkController', () => {
       networkVersion,
     } of INFURA_NETWORKS) {
       describe(`if the previous provider configuration had a type of "${networkType}"`, () => {
-        it('merges the previous configuration into the current provider configuration', async () => {
+        it('overwrites the the current provider configuration with the previous provider configuration', async () => {
           await withController(
             {
               state: {
@@ -4295,7 +4294,6 @@ describe('NetworkController', () => {
                 chainId: BUILT_IN_NETWORKS[networkType].chainId,
                 ticker: BUILT_IN_NETWORKS[networkType].ticker,
                 nickname: '',
-                id: 'testNetworkConfigurationId1',
                 rpcPrefs: {
                   blockExplorerUrl:
                     BUILT_IN_NETWORKS[networkType].blockExplorerUrl,
@@ -4871,7 +4869,7 @@ describe('NetworkController', () => {
     }
 
     describe(`if the previous provider configuration had a type of "rpc"`, () => {
-      it('merges the previous configuration into the current provider configuration', async () => {
+      it('overwrites the the current provider configuration with the previous provider configuration', async () => {
         await withController(
           {
             state: {
@@ -4940,7 +4938,6 @@ describe('NetworkController', () => {
               rpcPrefs: {
                 blockExplorerUrl: 'https://goerli.etherscan.io',
               },
-              id: 'testNetworkConfigurationId2',
             });
 
             await waitForLookupNetworkToComplete({
@@ -4953,8 +4950,8 @@ describe('NetworkController', () => {
               type: 'rpc',
               rpcUrl: 'https://mock-rpc-url-2',
               chainId: '0x1337',
-              ticker: 'TEST2',
               nickname: 'test-chain-2',
+              ticker: 'TEST2',
               rpcPrefs: {
                 blockExplorerUrl: 'test-block-explorer-2.com',
               },

From 3c622cd395f06d5a2e987160002338963badb479 Mon Sep 17 00:00:00 2001
From: Elliot Winkler <elliot.winkler@gmail.com>
Date: Thu, 16 Mar 2023 20:03:12 -0600
Subject: [PATCH 017/129] [TS dashboard] Draw dependencies between files
 (#17338)

If you're thinking about converting a file to TypeScript, you might want
to know what files import that file and what files it imports. This
commit makes it so that if you click on a box in the visualization, it
will draw lines between that box and the other boxes which represent its
dependents and dependencies.

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
---
 .../app/components/App.tsx                    | 166 ++++++++++----
 .../app/components/Box.tsx                    |  69 ++++++
 .../app/components/Connections.tsx            | 143 ++++++++++++
 .../app/components/types.ts                   |  15 ++
 .../app/styles/custom-elements.scss           |  60 ++++-
 .../common/build-module-partitions.ts         | 217 +++++++++++-------
 6 files changed, 543 insertions(+), 127 deletions(-)
 create mode 100644 development/ts-migration-dashboard/app/components/Box.tsx
 create mode 100644 development/ts-migration-dashboard/app/components/Connections.tsx
 create mode 100644 development/ts-migration-dashboard/app/components/types.ts

diff --git a/development/ts-migration-dashboard/app/components/App.tsx b/development/ts-migration-dashboard/app/components/App.tsx
index 317856a1f..e5ee1f3d0 100644
--- a/development/ts-migration-dashboard/app/components/App.tsx
+++ b/development/ts-migration-dashboard/app/components/App.tsx
@@ -1,7 +1,9 @@
-import React from 'react';
-import classnames from 'classnames';
-import { Tooltip as ReactTippy } from 'react-tippy';
+import React, { useState } from 'react';
 import { readPartitionsFile } from '../../common/partitions-file';
+import type { ModulePartitionChild } from '../../common/build-module-partitions';
+import Box from './Box';
+import Connections from './Connections';
+import type { BoxRect, BoxModel } from './types';
 
 type Summary = {
   numConvertedModules: number;
@@ -12,16 +14,85 @@ function calculatePercentageComplete(summary: Summary) {
   return ((summary.numConvertedModules / summary.numModules) * 100).toFixed(1);
 }
 
-export default function App() {
-  const partitions = readPartitionsFile();
+const partitions = readPartitionsFile();
+const allModules = partitions.flatMap((partition) => {
+  return partition.children;
+});
+const modulesById = allModules.reduce<Record<string, ModulePartitionChild>>(
+  (obj, module) => {
+    return { ...obj, [module.id]: module };
+  },
+  {},
+);
+const overallTotal = {
+  numConvertedModules: allModules.filter((module) => module.hasBeenConverted)
+    .length,
+  numModules: allModules.length,
+};
 
-  const allModules = partitions.flatMap((partition) => {
-    return partition.children;
-  });
-  const overallTotal = {
-    numConvertedModules: allModules.filter((module) => module.hasBeenConverted)
-      .length,
-    numModules: allModules.length,
+export default function App() {
+  const [boxRectsByModuleId, setBoxRectsById] = useState<Record<
+    string,
+    BoxRect
+  > | null>(null);
+  const boxesByModuleId =
+    boxRectsByModuleId === null
+      ? {}
+      : Object.values(boxRectsByModuleId).reduce<Record<string, BoxModel>>(
+          (obj, boxRect) => {
+            const module = modulesById[boxRect.moduleId];
+
+            const dependencyBoxRects = module.dependencyIds.reduce<BoxRect[]>(
+              (dependencyBoxes, dependencyId) => {
+                if (boxRectsByModuleId[dependencyId] === undefined) {
+                  return dependencyBoxes;
+                }
+                return [...dependencyBoxes, boxRectsByModuleId[dependencyId]];
+              },
+              [],
+            );
+
+            const dependentBoxRects = module.dependentIds.reduce<BoxRect[]>(
+              (dependentBoxes, dependentId) => {
+                if (boxRectsByModuleId[dependentId] === undefined) {
+                  return dependentBoxes;
+                }
+                return [...dependentBoxes, boxRectsByModuleId[dependentId]];
+              },
+              [],
+            );
+
+            return {
+              ...obj,
+              [boxRect.moduleId]: {
+                rect: boxRect,
+                dependencyBoxRects,
+                dependentBoxRects,
+              },
+            };
+          },
+          {},
+        );
+  const [activeBoxRectId, setActiveBoxRectId] = useState<string | null>(null);
+  const activeBoxRect =
+    boxRectsByModuleId === null || activeBoxRectId === null
+      ? null
+      : boxRectsByModuleId[activeBoxRectId];
+
+  const registerBox = (id: string, boxRect: BoxRect) => {
+    setBoxRectsById((existingBoxRectsById) => {
+      if (existingBoxRectsById === undefined) {
+        return { [id]: boxRect };
+      }
+      return { ...existingBoxRectsById, [id]: boxRect };
+    });
+  };
+  const toggleConnectionsFor = (id: string) => {
+    if (activeBoxRectId !== undefined && activeBoxRectId === id) {
+      setActiveBoxRectId(null);
+    } else {
+      setActiveBoxRectId(id);
+    }
   };
 
   return (
@@ -50,17 +121,35 @@ export default function App() {
           </p>
 
           <p>
-            Each box
-            <div className="module module--inline module--to-be-converted">
+            Each box on this page represents a file in the codebase. Gray boxes
+            <span className="module module--inline module--to-be-converted">
               &nbsp;
-            </div>
-            on this page represents a file that either we want to convert or
-            we've already converted to TypeScript (hover over a box to see the
-            filename). Boxes that are
-            <div className="module module--inline module--to-be-converted module--test">
+            </span>
+            represent files that need to be converted to TypeScript. Green boxes
+            <span className="module module--inline module--has-been-converted">
               &nbsp;
-            </div>
-            greyed out are test or Storybook files.
+            </span>
+            are files that have already been converted. Faded boxes
+            <span className="module module--inline module--to-be-converted module--test">
+              &nbsp;
+            </span>
+            <span
+              className="module module--inline module--has-been-converted module--test"
+              style={{ marginLeft: 0 }}
+            >
+              &nbsp;
+            </span>
+            are test or Storybook files.
+          </p>
+
+          <p>
+            You can hover over a box to see the name of the file that it
+            represents. You can also click on a box to see connections between
+            other files;{' '}
+            <strong className="module-connection__dependency">red</strong> lines
+            lead to dependencies (other files that import the file);{' '}
+            <strong className="module-connection__dependent">blue</strong> lines
+            lead to dependents (other files that are imported by the file).
           </p>
 
           <p>
@@ -103,36 +192,25 @@ export default function App() {
             <div key={partition.level} className="partition">
               <div className="partition__name">level {partition.level}</div>
               <div className="partition__children">
-                {partition.children.map(({ name, hasBeenConverted }) => {
-                  const isTest = /\.test\.(?:js|tsx?)/u.test(name);
-                  const isStorybookModule = /\.stories\.(?:js|tsx?)/u.test(
-                    name,
-                  );
+                {partition.children.map((module) => {
+                  const areConnectionsVisible = activeBoxRectId === module.id;
                   return (
-                    <ReactTippy
-                      key={name}
-                      title={name}
-                      arrow={true}
-                      animation="fade"
-                      duration={250}
-                      className="module__tooltipped"
-                      style={{ display: 'block' }}
-                    >
-                      <div
-                        className={classnames('module', {
-                          'module--has-been-converted': hasBeenConverted,
-                          'module--to-be-converted': !hasBeenConverted,
-                          'module--test': isTest,
-                          'module--storybook': isStorybookModule,
-                        })}
-                      />
-                    </ReactTippy>
+                    <Box
+                      key={module.id}
+                      module={module}
+                      register={registerBox}
+                      toggleConnectionsFor={toggleConnectionsFor}
+                      areConnectionsVisible={areConnectionsVisible}
+                    />
                   );
                 })}
               </div>
             </div>
           );
         })}
+        {activeBoxRect === null ? null : (
+          <Connections activeBox={boxesByModuleId[activeBoxRect.moduleId]} />
+        )}
       </div>
     </>
   );
diff --git a/development/ts-migration-dashboard/app/components/Box.tsx b/development/ts-migration-dashboard/app/components/Box.tsx
new file mode 100644
index 000000000..675cb63db
--- /dev/null
+++ b/development/ts-migration-dashboard/app/components/Box.tsx
@@ -0,0 +1,69 @@
+import React, { useEffect, useRef } from 'react';
+import classnames from 'classnames';
+import { Tooltip as ReactTippy } from 'react-tippy';
+import type { ModulePartitionChild } from '../../common/build-module-partitions';
+import type { BoxRect } from './types';
+
+export default function Box({
+  module,
+  register,
+  toggleConnectionsFor,
+  areConnectionsVisible,
+}: {
+  module: ModulePartitionChild;
+  register: (id: string, boxRect: BoxRect) => void;
+  toggleConnectionsFor: (id: string) => void;
+  areConnectionsVisible: boolean;
+}) {
+  const isTest = /\.test\.(?:js|tsx?)/u.test(module.id);
+  const isStorybookModule = /\.stories\.(?:js|tsx?)/u.test(module.id);
+  const ref = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (ref.current?.offsetParent) {
+      const rect = ref.current.getBoundingClientRect();
+      const offsetParentRect = ref.current.offsetParent.getBoundingClientRect();
+      const top = rect.top - offsetParentRect.top;
+      const left = rect.left - offsetParentRect.left;
+      const centerX = left + rect.width / 2;
+      const centerY = top + rect.height / 2;
+      register(module.id, {
+        moduleId: module.id,
+        top,
+        left,
+        width: rect.width,
+        height: rect.height,
+        centerX,
+        centerY,
+      });
+    }
+  }, [ref]);
+
+  const onClick = (event: React.MouseEvent<HTMLDivElement>) => {
+    event.preventDefault();
+    toggleConnectionsFor(module.id);
+  };
+
+  return (
+    <ReactTippy
+      title={module.id}
+      arrow={true}
+      animation="fade"
+      duration={250}
+      className="module__tooltipped"
+      style={{ display: 'block' }}
+    >
+      <div
+        ref={ref}
+        onClick={onClick}
+        className={classnames('module', {
+          'module--has-been-converted': module.hasBeenConverted,
+          'module--to-be-converted': !module.hasBeenConverted,
+          'module--test': isTest,
+          'module--storybook': isStorybookModule,
+          'module--active': areConnectionsVisible,
+        })}
+      />
+    </ReactTippy>
+  );
+}
diff --git a/development/ts-migration-dashboard/app/components/Connections.tsx b/development/ts-migration-dashboard/app/components/Connections.tsx
new file mode 100644
index 000000000..329bfb3e5
--- /dev/null
+++ b/development/ts-migration-dashboard/app/components/Connections.tsx
@@ -0,0 +1,143 @@
+import React from 'react';
+import type { BoxModel } from './types';
+
+function buildShapePoints(coordinates: [number, number][]): string {
+  return coordinates.map(([x, y]) => `${x},${y}`).join(' ');
+}
+
+function buildPathD(coordinates: [number, number][]): string {
+  return coordinates
+    .map(([x, y], index) => {
+      if (index === 0) {
+        return `M ${x},${y}`;
+      }
+      return `L ${x},${y}`;
+    })
+    .join(' ');
+}
+
+function Arrowhead({
+  type,
+  x,
+  y,
+}: {
+  type: 'dependency' | 'dependent';
+  x: number;
+  y: number;
+}) {
+  return (
+    <polygon
+      className={`module-connection__${type}-arrowhead`}
+      points={buildShapePoints([
+        [x - 6, y - 6],
+        [x + 6, y - 6],
+        [x, y],
+      ])}
+    />
+  );
+}
+
+function Line({
+  type,
+  originX,
+  originY,
+  originYOffset = 0,
+  destinationX,
+  destinationY,
+  destinationYOffset = 0,
+}: {
+  type: 'dependency' | 'dependent';
+  originX: number;
+  originY: number;
+  originYOffset?: number;
+  destinationX: number;
+  destinationY: number;
+  destinationYOffset?: number;
+}) {
+  const coordinates: [number, number][] =
+    type === 'dependency'
+      ? [
+          [originX, originY],
+          [originX, originY + originYOffset],
+          [destinationX, originY + originYOffset],
+          [destinationX, destinationY],
+        ]
+      : [
+          [originX, originY],
+          [originX, destinationY - destinationYOffset],
+          [destinationX, destinationY - destinationYOffset],
+          [destinationX, destinationY],
+        ];
+  return (
+    <path
+      className={`module-connection__${type}`}
+      d={buildPathD(coordinates)}
+    />
+  );
+}
+
+function LineStart({
+  type,
+  x,
+  y,
+}: {
+  type: 'dependency' | 'dependent';
+  x: number;
+  y: number;
+}) {
+  return (
+    <circle className={`module-connection__${type}-point`} cx={x} cy={y} />
+  );
+}
+
+export default function Connections({ activeBox }: { activeBox: BoxModel }) {
+  return (
+    <svg className="module-connections">
+      {activeBox.dependencyBoxRects.length === 0 ? null : (
+        <Arrowhead
+          type="dependency"
+          x={activeBox.rect.centerX}
+          y={activeBox.rect.centerY}
+        />
+      )}
+      {activeBox.dependencyBoxRects.map((dependencyBoxRect) => {
+        return (
+          <React.Fragment key={dependencyBoxRect.moduleId}>
+            <Line
+              type="dependency"
+              originX={dependencyBoxRect.centerX}
+              originY={dependencyBoxRect.centerY}
+              originYOffset={dependencyBoxRect.height / 2 + 7}
+              destinationX={activeBox.rect.centerX}
+              destinationY={activeBox.rect.centerY}
+            />
+            <LineStart
+              type="dependency"
+              x={dependencyBoxRect.centerX}
+              y={dependencyBoxRect.centerY}
+            />
+          </React.Fragment>
+        );
+      })}
+      {activeBox.dependentBoxRects.map((dependentBoxRect) => {
+        return (
+          <React.Fragment key={dependentBoxRect.moduleId}>
+            <Line
+              type="dependent"
+              originX={activeBox.rect.centerX}
+              originY={activeBox.rect.centerY}
+              destinationX={dependentBoxRect.centerX}
+              destinationY={dependentBoxRect.centerY}
+              destinationYOffset={dependentBoxRect.height / 2 + 7}
+            />
+            <Arrowhead
+              type="dependent"
+              x={dependentBoxRect.centerX}
+              y={dependentBoxRect.centerY}
+            />
+          </React.Fragment>
+        );
+      })}
+    </svg>
+  );
+}
diff --git a/development/ts-migration-dashboard/app/components/types.ts b/development/ts-migration-dashboard/app/components/types.ts
new file mode 100644
index 000000000..65b2349da
--- /dev/null
+++ b/development/ts-migration-dashboard/app/components/types.ts
@@ -0,0 +1,15 @@
+export type BoxRect = {
+  moduleId: string;
+  top: number;
+  left: number;
+  width: number;
+  height: number;
+  centerX: number;
+  centerY: number;
+};
+
+export type BoxModel = {
+  rect: BoxRect;
+  dependencyBoxRects: BoxRect[];
+  dependentBoxRects: BoxRect[];
+};
diff --git a/development/ts-migration-dashboard/app/styles/custom-elements.scss b/development/ts-migration-dashboard/app/styles/custom-elements.scss
index 216c1ed6d..e53562024 100644
--- a/development/ts-migration-dashboard/app/styles/custom-elements.scss
+++ b/development/ts-migration-dashboard/app/styles/custom-elements.scss
@@ -2,6 +2,10 @@
   --blue-gray-350: hsl(209deg 13.7% 62.4%);
   --blue-gray-100: hsl(209.8deg 16.5% 89%);
   --green: hsl(113deg 100% 38%);
+  --red: hsl(13deg 98% 61%);
+  --blue: hsl(246deg 97% 55%);
+  --light-cyan: hsl(178deg 100% 85%);
+  --cyan: hsl(178deg 100% 42%);
 }
 
 .page-header {
@@ -69,6 +73,10 @@
   border: 1px solid rgb(0 0 0 / 50%);
 }
 
+.partitions {
+  position: relative;
+}
+
 .partition {
   display: flex;
   gap: 0.5rem;
@@ -94,8 +102,9 @@
 .module {
   width: 1.5rem;
   height: 1.5rem;
-  border: 1px solid rgba(0 0 0 / 25%);
+  border: 1px solid hsla(0deg 0% 0% / 25%);
   border-radius: 0.25rem;
+  cursor: pointer;
 
   &--inline {
     display: inline-block;
@@ -120,6 +129,55 @@
   &--storybook {
     opacity: 0.3;
   }
+
+  &--active {
+    border-color: var(--cyan);
+    background-color: var(--light-cyan);
+    border-width: 2px;
+  }
+}
+
+.module-connections {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  pointer-events: none;
+}
+
+.module-connection {
+  &__dependency-arrowhead {
+    fill: var(--red);
+  }
+
+  &__dependency {
+    fill: none;
+    stroke: var(--red);
+    color: var(--red);
+    stroke-width: 2px;
+  }
+
+  &__dependency-point {
+    fill: var(--red);
+    r: 3px;
+  }
+
+  &__dependent-arrowhead {
+    fill: var(--blue);
+  }
+
+  &__dependent {
+    fill: none;
+    stroke: var(--blue);
+    color: var(--blue);
+    stroke-width: 2px;
+  }
+
+  &__dependent-point {
+    fill: var(--blue);
+    r: 3px;
+  }
 }
 
 /* Package overrides */
diff --git a/development/ts-migration-dashboard/common/build-module-partitions.ts b/development/ts-migration-dashboard/common/build-module-partitions.ts
index 8ceaff18a..aa58568b3 100644
--- a/development/ts-migration-dashboard/common/build-module-partitions.ts
+++ b/development/ts-migration-dashboard/common/build-module-partitions.ts
@@ -9,24 +9,42 @@ import {
 } from './constants';
 
 /**
- * Represents a module that has been imported somewhere in the codebase.
+ * Represents a module that has been imported somewhere in the codebase, whether
+ * it is local to the project or an NPM package.
  *
- * @property id - The name of a file or NPM module.
+ * @property id - If an NPM package, then the name of the package; otherwise the
+ * path to a file within the project.
  * @property dependents - The modules which are imported by this module.
  * @property level - How many modules it takes to import this module (from the
  * root of the dependency tree).
- * @property isExternal - Whether the module refers to a NPM module.
+ * @property isExternal - Whether the module refers to a NPM package.
  * @property hasBeenConverted - Whether the module was one of the files we
  * wanted to convert to TypeScript and has been converted.
  */
 type Module = {
   id: string;
   dependents: Module[];
+  dependencies: Module[];
   level: number;
   isExternal: boolean;
   hasBeenConverted: boolean;
 };
 
+/**
+ * Represents a module that belongs to a certain level within the dependency
+ * graph, displayed as a box in the UI.
+ *
+ * @property id - The id of the module.
+ * @property hasBeenConverted - Whether or not the module has been converted to
+ * TypeScript.
+ */
+export type ModulePartitionChild = {
+  id: string;
+  hasBeenConverted: boolean;
+  dependentIds: string[];
+  dependencyIds: string[];
+};
+
 /**
  * Represents a set of modules that sit at a certain level within the final
  * dependency tree.
@@ -34,16 +52,10 @@ type Module = {
  * @property level - How many modules it takes to import this module (from the
  * root of the dependency tree).
  * @property children - The modules that share this same level.
- * @property children[].name - The name of the item being imported.
- * @property children[].hasBeenConverted - Whether or not the module (assuming
- * that it is a file in our codebase) has been converted to TypeScript.
  */
 export type ModulePartition = {
   level: number;
-  children: {
-    name: string;
-    hasBeenConverted: boolean;
-  }[];
+  children: ModulePartitionChild[];
 };
 
 /**
@@ -196,10 +208,11 @@ function buildModulesWithLevels(
   // includes `foo.js`, so we say `foo.js` is a circular dependency of `baz.js`,
   // and we don't need to follow it.
 
-  const modulesToFill: Module[] = entryModuleIds.map((moduleId) => {
+  let modulesToFill: Module[] = entryModuleIds.map((moduleId) => {
     return {
       id: moduleId,
       dependents: [],
+      dependencies: [],
       level: 0,
       isExternal: false,
       hasBeenConverted: /\.tsx?$/u.test(moduleId),
@@ -208,76 +221,101 @@ function buildModulesWithLevels(
   const modulesById: Record<string, Module> = {};
 
   while (modulesToFill.length > 0) {
-    const currentModule = modulesToFill.shift() as Module;
-    const childModulesToFill: Module[] = [];
-    (dependenciesByModuleId[currentModule.id] ?? []).forEach(
-      (givenChildModuleId) => {
-        const npmPackageMatch = givenChildModuleId.match(
-          /^node_modules\/(?:(@[^/]+)\/)?([^/]+)\/.+$/u,
-        );
+    const currentModule = modulesToFill[0];
 
-        let childModuleId;
-        if (npmPackageMatch) {
-          childModuleId =
-            npmPackageMatch[1] === undefined
-              ? `${npmPackageMatch[2]}`
-              : `${npmPackageMatch[1]}/${npmPackageMatch[2]}`;
-        } else {
-          childModuleId = givenChildModuleId;
-        }
-
-        // Skip circular dependencies
-        if (
-          findDirectAndIndirectDependentIdsOf(currentModule).has(childModuleId)
-        ) {
-          return;
-        }
-
-        // Skip files that weren't on the original list of JavaScript files to
-        // convert, as we don't want them to show up on the status dashboard
-        if (
-          !npmPackageMatch &&
-          !allowedFilePaths.includes(childModuleId.replace(/\.tsx?$/u, '.js'))
-        ) {
-          return;
-        }
-
-        const existingChildModule = modulesById[childModuleId];
-
-        if (existingChildModule === undefined) {
-          const childModule: Module = {
-            id: childModuleId,
-            dependents: [currentModule],
-            level: currentModule.level + 1,
-            isExternal: Boolean(npmPackageMatch),
-            hasBeenConverted: /\.tsx?$/u.test(childModuleId),
-          };
-          childModulesToFill.push(childModule);
-        } else {
-          if (currentModule.level + 1 > existingChildModule.level) {
-            existingChildModule.level = currentModule.level + 1;
-            // Update descendant modules' levels
-            childModulesToFill.push(existingChildModule);
-          } else {
-            // There is no point in descending into dependencies of this module
-            // if the new level of the module would be <= the existing level,
-            // because all of the dependencies from this point on are guaranteed
-            // to have a higher level and are therefore already at the right
-            // level.
-          }
-
-          if (!existingChildModule.dependents.includes(currentModule)) {
-            existingChildModule.dependents.push(currentModule);
-          }
-        }
-      },
-    );
-    if (childModulesToFill.length > 0) {
-      modulesToFill.push(...childModulesToFill);
+    if (currentModule.level > 100) {
+      throw new Error(
+        "Can't build module partitions, as the dependency graph is being traversed ad infinitum.",
+      );
     }
+
+    const dependencyModulesToFill: Module[] = [];
+    for (const nonCanonicalDependencyModuleId of dependenciesByModuleId[
+      currentModule.id
+    ]) {
+      // If the file path of the module is located in `node_modules`, use the
+      // name of the package as the ID
+      let dependencyModuleId;
+      const npmPackageMatch = nonCanonicalDependencyModuleId.match(
+        /^node_modules\/(?:(@[^/]+)\/)?([^/]+)\/.+$/u,
+      );
+      if (npmPackageMatch) {
+        dependencyModuleId =
+          npmPackageMatch[1] === undefined
+            ? `${npmPackageMatch[2]}`
+            : `${npmPackageMatch[1]}/${npmPackageMatch[2]}`;
+      } else {
+        dependencyModuleId = nonCanonicalDependencyModuleId;
+      }
+
+      // Skip circular dependencies
+      if (
+        findDirectAndIndirectDependentIdsOf(currentModule).has(
+          dependencyModuleId,
+        )
+      ) {
+        continue;
+      }
+
+      // Skip files that weren't on the original list of JavaScript files to
+      // convert, as we don't want them to show up on the status dashboard
+      if (
+        !npmPackageMatch &&
+        !allowedFilePaths.includes(
+          dependencyModuleId.replace(/\.tsx?$/u, '.js'),
+        )
+      ) {
+        continue;
+      }
+
+      let existingDependencyModule = modulesById[dependencyModuleId];
+
+      if (existingDependencyModule === undefined) {
+        existingDependencyModule = {
+          id: dependencyModuleId,
+          dependents: [currentModule],
+          dependencies: [],
+          level: currentModule.level + 1,
+          isExternal: Boolean(npmPackageMatch),
+          hasBeenConverted: /\.tsx?$/u.test(dependencyModuleId),
+        };
+        dependencyModulesToFill.push(existingDependencyModule);
+      } else if (currentModule.level + 1 > existingDependencyModule.level) {
+        existingDependencyModule.level = currentModule.level + 1;
+        // Update descendant modules' levels
+        dependencyModulesToFill.push(existingDependencyModule);
+      } else {
+        // There is no point in descending into dependencies of this module
+        // if the new level of the module would be <= the existing level,
+        // because all of the dependencies from this point on are guaranteed
+        // to have a higher level and are therefore already at the right
+        // level.
+      }
+
+      if (
+        !existingDependencyModule.dependents.some(
+          (m) => m.id === currentModule.id,
+        )
+      ) {
+        existingDependencyModule.dependents.push(currentModule);
+      }
+
+      if (
+        !currentModule.dependencies.some(
+          (m) => m.id === existingDependencyModule.id,
+        )
+      ) {
+        currentModule.dependencies.push(existingDependencyModule);
+      }
+    }
+    if (dependencyModulesToFill.length > 0) {
+      modulesToFill.push(...dependencyModulesToFill);
+    }
+
     if (!(currentModule.id in modulesById)) {
       modulesById[currentModule.id] = currentModule;
     }
+    modulesToFill = modulesToFill.slice(1);
   }
 
   return modulesById;
@@ -288,20 +326,21 @@ function buildModulesWithLevels(
  * which import that file directly or through some other file.
  *
  * @param module - A module in the graph.
- * @returns The ids of the modules which are incoming connections to
+ * @returns The ids of the modules which are direct and indirect dependents of
  * the module.
  */
 function findDirectAndIndirectDependentIdsOf(module: Module): Set<string> {
-  const modulesToProcess = [module];
+  let modulesToProcess = [module];
   const allDependentIds = new Set<string>();
   while (modulesToProcess.length > 0) {
-    const currentModule = modulesToProcess.shift() as Module;
-    currentModule.dependents.forEach((dependent) => {
+    const currentModule = modulesToProcess[0];
+    for (const dependent of currentModule.dependents) {
       if (!allDependentIds.has(dependent.id)) {
         allDependentIds.add(dependent.id);
         modulesToProcess.push(dependent);
       }
-    });
+    }
+    modulesToProcess = modulesToProcess.slice(1);
   }
   return allDependentIds;
 }
@@ -328,8 +367,22 @@ function partitionModulesByLevel(
   }
   Object.values(modulesById).forEach((module) => {
     modulePartitions[module.level].children.push({
-      name: module.id,
+      id: module.id,
       hasBeenConverted: module.hasBeenConverted,
+      dependentIds: module.dependents.map((dependent) => dependent.id).sort(),
+      dependencyIds: module.dependencies
+        .map((dependency) => dependency.id)
+        .sort(),
+    });
+  });
+  Object.values(modulePartitions).forEach((partition) => {
+    partition.children.sort((a, b) => {
+      if (a.id < b.id) {
+        return -1;
+      } else if (a.id > b.id) {
+        return 1;
+      }
+      return 0;
     });
   });
   return modulePartitions.reverse();

From e1ce248364f5e4cad6514a1b2ba78e8b325bdfe9 Mon Sep 17 00:00:00 2001
From: Peter <53189696+PeterYinusa@users.noreply.github.com>
Date: Fri, 17 Mar 2023 09:55:52 +0000
Subject: [PATCH 018/129] e2e test erc20 fixtures (#18154)

* add fixture

* update test

* update test

* wait for ETH balance
---
 test/e2e/fixture-builder.js             | 37 ++++++++++++
 test/e2e/tests/send-hex-address.spec.js | 79 +++++++------------------
 test/e2e/tests/send-to-contract.spec.js | 24 +-------
 3 files changed, 58 insertions(+), 82 deletions(-)

diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 145d6bfc0..a56197f4e 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -701,6 +701,43 @@ class FixtureBuilder {
     return this;
   }
 
+  withTokensControllerERC20() {
+    merge(this.fixture.data.TokensController, {
+      tokens: [
+        {
+          address: `__FIXTURE_SUBSTITUTION__CONTRACT${SMART_CONTRACTS.HST}`,
+          symbol: 'TST',
+          decimals: 4,
+          image:
+            'https://static.metafi.codefi.network/api/v1/tokenIcons/1337/0x581c3c1a2a4ebde2a0df29b5cf4c116e42945947.png',
+          isERC721: false,
+          aggregators: [],
+        },
+      ],
+      ignoredTokens: [],
+      detectedTokens: [],
+      allTokens: {
+        '0x539': {
+          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1': [
+            {
+              address: `__FIXTURE_SUBSTITUTION__CONTRACT${SMART_CONTRACTS.HST}`,
+              symbol: 'TST',
+              decimals: 4,
+              image:
+                'https://static.metafi.codefi.network/api/v1/tokenIcons/1337/0x581c3c1a2a4ebde2a0df29b5cf4c116e42945947.png',
+              isERC721: false,
+              aggregators: [],
+            },
+          ],
+        },
+      },
+      allIgnoredTokens: {},
+      allDetectedTokens: {},
+      suggestedAssets: [],
+    });
+    return this;
+  }
+
   withTransactionController(data) {
     merge(
       this.fixture.data.TransactionController
diff --git a/test/e2e/tests/send-hex-address.spec.js b/test/e2e/tests/send-hex-address.spec.js
index fcde57874..32301d325 100644
--- a/test/e2e/tests/send-hex-address.spec.js
+++ b/test/e2e/tests/send-hex-address.spec.js
@@ -123,43 +123,20 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
     await withFixtures(
       {
         dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
+        fixtures: new FixtureBuilder().withTokensControllerERC20().build(),
         ganacheOptions,
         smartContract,
         title: this.test.title,
         failOnConsoleError: false,
       },
-      async ({ driver, contractRegistry }) => {
-        const contractAddress = await contractRegistry.getContractAddress(
-          smartContract,
-        );
+      async ({ driver }) => {
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
-
-        await driver.openNewPage(
-          `http://127.0.0.1:8080/?contract=${contractAddress}`,
-        );
-        let windowHandles = await driver.getAllWindowHandles();
-        const extension = windowHandles[0];
-
-        // Using the line below to make wait time deterministic and avoid using a delay
-        // See more here https://github.com/MetaMask/metamask-extension/pull/15604/files#r949300551
-        await driver.findClickableElement('#deployButton');
-
-        // Add token
-        await driver.clickElement('#watchAsset');
-        await driver.waitUntilXWindowHandles(3);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Add token', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
+        await driver.waitForSelector({
+          css: '[data-testid="eth-overview__primary-currency"]',
+          text: '24.9977 ETH',
+        });
 
         // Send TST
         await driver.clickElement('[data-testid="home__asset-tab"]');
@@ -175,7 +152,10 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
           css: '.ens-input__selected-input__title',
           text: hexPrefixedAddress,
         });
-        await driver.delay(2000);
+        await driver.waitForSelector({
+          css: '.transaction-detail-item',
+          text: '0.00008346 ETH',
+        });
         await driver.clickElement({ text: 'Next', tag: 'button' });
 
         // Confirm transaction
@@ -208,42 +188,20 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
     await withFixtures(
       {
         dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
+        fixtures: new FixtureBuilder().withTokensControllerERC20().build(),
         ganacheOptions,
         smartContract,
         title: this.test.title,
         failOnConsoleError: false,
       },
-      async ({ driver, contractRegistry }) => {
-        const contractAddress = await contractRegistry.getContractAddress(
-          smartContract,
-        );
+      async ({ driver }) => {
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
-
-        // Create TST
-        await driver.openNewPage(
-          `http://127.0.0.1:8080/?contract=${contractAddress}`,
-        );
-
-        let windowHandles = await driver.getAllWindowHandles();
-        const extension = windowHandles[0];
-
-        // Add token
-        await driver.findClickableElement('#deployButton');
-        await driver.clickElement('#watchAsset');
-        await driver.waitUntilXWindowHandles(3);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Add token', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
+        await driver.waitForSelector({
+          css: '[data-testid="eth-overview__primary-currency"]',
+          text: '24.9977 ETH',
+        });
 
         // Send TST
         await driver.clickElement('[data-testid="home__asset-tab"]');
@@ -259,7 +217,10 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
           css: '.ens-input__selected-input__title',
           text: hexPrefixedAddress,
         });
-        await driver.delay(2000);
+        await driver.waitForSelector({
+          css: '.transaction-detail-item',
+          text: '0.00008346 ETH',
+        });
         await driver.clickElement({ text: 'Next', tag: 'button' });
 
         // Confirm transaction
diff --git a/test/e2e/tests/send-to-contract.spec.js b/test/e2e/tests/send-to-contract.spec.js
index e7dffa5e7..62a6a58e4 100644
--- a/test/e2e/tests/send-to-contract.spec.js
+++ b/test/e2e/tests/send-to-contract.spec.js
@@ -18,9 +18,7 @@ describe('Send ERC20 token to contract address', function () {
     await withFixtures(
       {
         dapp: true,
-        fixtures: new FixtureBuilder()
-          .withPermissionControllerConnectedToTestDapp()
-          .build(),
+        fixtures: new FixtureBuilder().withTokensControllerERC20().build(),
         ganacheOptions,
         smartContract,
         title: this.test.title,
@@ -34,26 +32,6 @@ describe('Send ERC20 token to contract address', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
-        // Create TST
-        await driver.openNewPage(
-          `http://127.0.0.1:8080/?contract=${contractAddress}`,
-        );
-        let windowHandles = await driver.getAllWindowHandles();
-        const extension = windowHandles[0];
-
-        // Add token
-        await driver.findClickableElement('#deployButton');
-        await driver.clickElement('#watchAsset');
-        await driver.waitUntilXWindowHandles(3);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Add token', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
-
         // Send TST
         await driver.clickElement('[data-testid="home__asset-tab"]');
         await driver.clickElement('.token-cell');

From d6f58bceb0f9ca9087ff51fe9ce80d3e1993458b Mon Sep 17 00:00:00 2001
From: Guillaume Roux <guillaumeroux123@gmail.com>
Date: Fri, 17 Mar 2023 12:00:05 +0100
Subject: [PATCH 019/129] [FLASK] `snaps-monorepo@0.31.0` (#18142)

* allow SnapController to call `ApprovalController:updateRequestState` action

* combine popups

* show only autorship pill on result

* lint

* update `snaps-monorepo@0.31.0` and regen policies

* dedupe deps and fix fencing

* fix update button text

* fix fencing

* Update a bunch of e2es

* address requested changes

* update policy

* bump key-tree

* fix lint

* Update RPC E2E

* fix locales

* Remove wrong instance of window handle polling

* design changes and address pr comments

* remove unused imports

* fix lint

* fix fencing

* remove unused locales

* fence things

* re-add redirection

* bump test-snaps version

* Fix update e2e

* fix redirecting logic and address requested changes

* force update metamask state on approved

* move force update

---------

Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
---
 app/_locales/de/messages.json                 |   7 -
 app/_locales/el/messages.json                 |   7 -
 app/_locales/en/messages.json                 |  43 ++++--
 app/_locales/es/messages.json                 |   7 -
 app/_locales/fr/messages.json                 |   7 -
 app/_locales/hi/messages.json                 |   7 -
 app/_locales/id/messages.json                 |   7 -
 app/_locales/ja/messages.json                 |   7 -
 app/_locales/ko/messages.json                 |   7 -
 app/_locales/pt/messages.json                 |   7 -
 app/_locales/ru/messages.json                 |   7 -
 app/_locales/tl/messages.json                 |   7 -
 app/_locales/tr/messages.json                 |   7 -
 app/_locales/vi/messages.json                 |   7 -
 app/_locales/zh_CN/messages.json              |   7 -
 app/scripts/metamask-controller.js            |   2 +-
 lavamoat/browserify/beta/policy.json          |  14 +-
 lavamoat/browserify/desktop/policy.json       |  56 +-------
 lavamoat/browserify/flask/policy.json         |  56 +-------
 lavamoat/browserify/main/policy.json          |  14 +-
 package.json                                  |  10 +-
 test/e2e/snaps/enums.js                       |   2 +-
 test/e2e/snaps/test-snap-bip-32.spec.js       |  17 ++-
 test/e2e/snaps/test-snap-bip-44.spec.js       |  17 ++-
 test/e2e/snaps/test-snap-cronjob.spec.js      |  15 +-
 test/e2e/snaps/test-snap-dialog.spec.js       |  15 +-
 test/e2e/snaps/test-snap-error.spec.js        |  17 +--
 test/e2e/snaps/test-snap-installed.spec.js    |  31 +++--
 test/e2e/snaps/test-snap-management.spec.js   |  16 +--
 test/e2e/snaps/test-snap-managestate.spec.js  |  18 +--
 test/e2e/snaps/test-snap-notification.spec.js |  18 +--
 test/e2e/snaps/test-snap-rpc.spec.js          | 102 +++++++-------
 test/e2e/snaps/test-snap-txinsights.spec.js   |  19 +--
 test/e2e/snaps/test-snap-update.spec.js       |  28 ++--
 .../app/flask/install-error/index.js          |   1 +
 .../app/flask/install-error/install-error.js  |  39 ++++++
 .../snap-install-warning.js                   |  29 ++--
 .../snaps-authorship-pill.js                  |  17 ++-
 ui/helpers/constants/routes.ts                |   2 +
 ui/helpers/utils/permission.js                |  13 +-
 ui/helpers/utils/util.js                      |  14 +-
 .../flask/snap-install/index.scss             |  21 ++-
 .../flask/snap-install/snap-install.js        | 119 ++++++++++++----
 .../flask/snap-result/index.js                |   1 +
 .../flask/snap-result/index.scss              |  16 +++
 .../flask/snap-result/snap-result.js          | 128 +++++++++++++++++
 .../flask/snap-update/index.scss              |  24 +++-
 .../flask/snap-update/snap-update.js          | 130 +++++++++++++-----
 ui/pages/permissions-connect/flask/util.js    |  50 +++++--
 ui/pages/permissions-connect/index.scss       |   1 +
 .../permissions-connect.component.js          | 128 +++++++++++++----
 .../permissions-connect.container.js          |  19 ++-
 ui/selectors/permissions.js                   |  12 +-
 ui/store/actions.ts                           |   1 +
 yarn.lock                                     | 102 +++++++-------
 55 files changed, 892 insertions(+), 583 deletions(-)
 create mode 100644 ui/components/app/flask/install-error/index.js
 create mode 100644 ui/components/app/flask/install-error/install-error.js
 create mode 100644 ui/pages/permissions-connect/flask/snap-result/index.js
 create mode 100644 ui/pages/permissions-connect/flask/snap-result/index.scss
 create mode 100644 ui/pages/permissions-connect/flask/snap-result/snap-result.js

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 43af11d51..f5e257ef6 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -3376,16 +3376,9 @@
     "message": "Sie gewähren dem Snap „$1“ wichtige $2-Zugriffsrechte. Dies kann nicht rückgängig gemacht werden und gibt „$1“ Kontrolle über Ihre $2-Konten und Vermögenswerte. Stellen Sie sicher, dass Sie „$1“ vertrauen, bevor Sie fortfahren.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Für diesen Snap werden die folgenden Berechtigungen beantragt:"
-  },
   "snapUpdate": {
     "message": "Snap aktualisieren"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 benötigt eine neuere Version Ihres Snaps.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Snaps"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index d52e449d2..f2ab8a5e0 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -3376,16 +3376,9 @@
     "message": "Εκχωρείτε στο $2 βασική πρόσβαση στο snap \"$1\". Αυτό είναι αμετάκλητο και παρέχει στο \"$1\" τον έλεγχο των λογαριασμών και των περιουσιακών σας στοιχείων $2. Βεβαιωθείτε ότι εμπιστεύεστε το \"$1\" προτού συνεχίσετε.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Αυτό το snap αιτείται τις παρακάτω άδειες:"
-  },
   "snapUpdate": {
     "message": "Ενημέρωση Snap"
   },
-  "snapUpdateExplanation": {
-    "message": "Το $1 χρειάζεται μια νεότερη έκδοση του snap σας.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Snaps"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 06f9ea6d7..59eae8ed9 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3028,6 +3028,9 @@
   "replace": {
     "message": "replace"
   },
+  "requestFailed": {
+    "message": "Request failed"
+  },
   "requestFlaggedAsMaliciousFallbackCopyReason": {
     "message": "The security provider has not shared additional details"
   },
@@ -3427,25 +3430,46 @@
   "snapInstall": {
     "message": "Install snap"
   },
+  "snapInstallRequest": {
+    "message": "$1 wants to install $2. Make sure you trust the authors before you proceed.",
+    "description": "$1 is the dApp origin requesting the snap and $2 is the snap name"
+  },
+  "snapInstallRequestsPermission": {
+    "message": "$1 wants to install $2, which is requesting the following permissions. Make sure you trust the authors before you proceed.",
+    "description": "$1 is the dApp origin requesting the snap and $2 is the snap name"
+  },
   "snapInstallWarningCheck": {
-    "message": "To confirm that you understand, check the box."
+    "message": "Ensure that the permission below align with your intended actions. Only proceed with authors you trust."
   },
   "snapInstallWarningCheckPlural": {
-    "message": "To confirm that you understand, check all the boxes."
+    "message": "Ensure that the permissions below align with your intended actions. Only proceed with authors you trust."
+  },
+  "snapInstallWarningHeading": {
+    "message": "Proceed with caution"
   },
   "snapInstallWarningKeyAccess": {
-    "message": "You are granting $2 key access to the snap \"$1\". This is irrevocable and grants \"$1\" control of your $2 accounts and assets. Make sure you trust \"$1\" before proceeding.",
+    "message": "Grant $2 key access to $1",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "This snap is requesting the following permissions:"
+  "snapResultError": {
+    "message": "Error"
+  },
+  "snapResultSuccess": {
+    "message": "Success"
+  },
+  "snapResultSuccessDescription": {
+    "message": "$1 is now available to use."
   },
   "snapUpdate": {
     "message": "Update snap"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 needs a newer version of your snap.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
+  "snapUpdateRequest": {
+    "message": "$1 wants to update $2. Make sure you trust the authors before you proceed.",
+    "description": "$1 is the dApp origin requesting the snap and $2 is the snap name"
+  },
+  "snapUpdateRequestsPermission": {
+    "message": "$1 wants to update $2, which is requesting the following permissions. Make sure you trust the authors before you proceed.",
+    "description": "$1 is the dApp origin requesting the snap and $2 is the snap name"
   },
   "snaps": {
     "message": "Snaps"
@@ -4386,6 +4410,9 @@
   "upArrow": {
     "message": "up arrow"
   },
+  "update": {
+    "message": "Update"
+  },
   "updatedWithDate": {
     "message": "Updated $1"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 73c1a4e7b..ad1319017 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -3376,16 +3376,9 @@
     "message": "Está otorgando acceso clave de $2 al complemento \"$1\". Esto es irrevocable y le otorga a \"$1\" el control de sus cuentas y activos de $2. Asegúrese de que confía en \"$1\" antes de continuar.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Este complemento solicita los siguientes permisos:"
-  },
   "snapUpdate": {
     "message": "Actualizar complemento"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 necesita una versión más reciente de su complemento.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Complementos"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 97e1254ac..78408e2db 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -3376,16 +3376,9 @@
     "message": "Vous autorisez $2 à accéder à la clé du snap « $1 ». Cette action est irréversible et accorde à « $1 » le contrôle de vos comptes et actifs $2. Assurez-vous que vous faites confiance à « $1 » avant de continuer.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Ce snap demande les autorisations suivantes :"
-  },
   "snapUpdate": {
     "message": "Mettre à jour Snap"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 a besoin d’une version plus récente de votre snap.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Snaps"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 65ebfc994..61eafe59d 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -3376,16 +3376,9 @@
     "message": "आप स्नैप \"$1\" के लिए $2 कुंजी का एक्सेस प्रदान कर रहे हैं। यह अपरिवर्तनीय है और आपके $2 खातों और संपत्तियों पर \"$1\" नियंत्रण प्रदान करता है। आगे बढ़ने से पहले सुनिश्चित करें कि आप \"$1\" पर भरोसा करते हैं।",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "ये स्नैप निम्नलिखित अनुमतियों हेतु अनुरोध कर रहा है:"
-  },
   "snapUpdate": {
     "message": "स्नैप अपडेट करें"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 को आपके स्नैप के नए वर्जन की जरूरत है।",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "स्नैप्स"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index d8edf57a2..76dd89d9b 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -3376,16 +3376,9 @@
     "message": "Anda memberikan $2 akses kunci ke snap \"$1\". Tindakan ini tidak dapat dibatalkan dan memberikan kendali \"$1\" atas akun dan aset $2 Anda. Sebelum melanjutkan, pastikan \"$1\" aman.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Snap ini meminta izin berikut:"
-  },
   "snapUpdate": {
     "message": "Perbarui Snap"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 memerlukan versi snap yang lebih baru.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Snap"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 16f6624fa..eb13dbc01 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -3376,16 +3376,9 @@
     "message": "スナップ「$1」に $2 へのキーアクセスを許可しようとしています。この操作は取り消し不能であり、$2 アカウントとアセットのコントロールを「$1」に許可することになります。続行する前に、必ず「$1」が信頼できることを確認してください。",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "このスナップが次のパーミッションをリクエストしています:"
-  },
   "snapUpdate": {
     "message": "スナップを更新"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 に新しいバージョンのスナップが必要です。",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "スナップ"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index c328b268c..7b24d0458 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -3376,16 +3376,9 @@
     "message": "'$1' 스냅 이용에 필요한 $2 키 액세스 권한을 부여하고 있습니다. 이 작업은 사용자의 $2 계정과 자산에 '$1' 제어 권한을 부여하며 취소가 불가능합니다. '$1의 신뢰성을 확인한 후에 진행하세요.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "이 스냅이 다음 권한을 요청하고 있습니다."
-  },
   "snapUpdate": {
     "message": "스냅 업데이트"
   },
-  "snapUpdateExplanation": {
-    "message": "$1에는 스냅의 새 버전이 필요합니다",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "스냅"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 2c06c360f..ae39ab7d9 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -3376,16 +3376,9 @@
     "message": "Você está concedendo ao snap \"$1\" acesso à sua chave $2. Isso é irrevogável e concede a \"$1\" controle de suas contas e ativos $2. Certifique-se de que confia em \"$1\" antes de prosseguir.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Esse snap está solicitando as seguintes permissões:"
-  },
   "snapUpdate": {
     "message": "Atualizar snap"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 precisa de uma versão mais nova do seu snap.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Snaps"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 4e20ccf14..f4edcbfc1 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -3376,16 +3376,9 @@
     "message": "Вы предоставляете ключ доступа $2 к привязке \"$1\". Это действие нельзя отменить, и оно предоставляет \"$1\" управление всеми счетами и активами $2. Перед тем как продолжить, убедитесь, что доверяете \"$1\".",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Этот снап запрашивает следующие разрешения:"
-  },
   "snapUpdate": {
     "message": "Обновить снап"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 нужна более новая версия вашей привязки.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Снапы"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index dd8593209..461e9f291 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -3376,16 +3376,9 @@
     "message": "Binibigyan mo ang $2 ng key access sa snap na \"$1\". Hindi na ito mababawi at nagbibigay ito sa \"$1\" ng kontrol sa iyong mga $2 account at asset. Tiyaking pinagkakatiwalaan mo ang \"$1\" bago magpatuloy.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Hinihiling ng snap na ito ang mga sumusunod na pahintulot:"
-  },
   "snapUpdate": {
     "message": "I-update ang snap"
   },
-  "snapUpdateExplanation": {
-    "message": "Kailangan ng $1 ng bagong bersyon ng iyong snap.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Mga Snap"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index f08af92c7..8472fce54 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -3376,16 +3376,9 @@
     "message": "\"$1\" için $2 anahtar erişimi veriyorsunuz. Bu iptal edilemez ve $2 hesaplarınıza ve varlıklarınıza \"$1\" kontrolü verir. İlerlemeden önce \"$1\" alanına güvendiğinizden emin olun.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Bu ek, aşağıdaki izinleri istiyor:"
-  },
   "snapUpdate": {
     "message": "Snap'i güncelle"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 için daha yeni bir snap sürümü gerekli.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Snap'ler"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index dd7b0f795..892ad6942 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -3376,16 +3376,9 @@
     "message": "Bạn đang cấp quyền truy cập khóa $2 cho Snap \"$1\". Hành động này không thể hủy bỏ và sẽ cấp quyền kiểm soát tài khoản và tài sản $2 của bạn cho \"$1\". Đảm bảo bạn tin tưởng \"$1\" trước khi tiếp tục.",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "Snap này đang yêu cầu các quyền sau:"
-  },
   "snapUpdate": {
     "message": "Cập nhật Snap"
   },
-  "snapUpdateExplanation": {
-    "message": "$1 cần một phiên bản Snap mới hơn.",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Snap"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 981759685..9fec36276 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -3376,16 +3376,9 @@
     "message": "您正在向snap \"$1\"授予$2的密钥访问权限。此操作不可撤销，并会向\"$1\"授予对您的$2账户和资产的控制权。在继续之前，请确保您信任\"$1\"。",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
-  "snapRequestsPermission": {
-    "message": "此Snap正在请求以下权限："
-  },
   "snapUpdate": {
     "message": "更新Snap"
   },
-  "snapUpdateExplanation": {
-    "message": "$1需要更新版本的snap。",
-    "description": "$1 is the dapp that is requesting an update to the snap."
-  },
   "snaps": {
     "message": "Snap"
   },
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 61f52a635..c42770804 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -787,6 +787,7 @@ export default class MetamaskController extends EventEmitter {
         `${this.permissionController.name}:getSubjectNames`,
         `${this.permissionController.name}:updateCaveat`,
         `${this.approvalController.name}:addRequest`,
+        `${this.approvalController.name}:updateRequestState`,
         `${this.permissionController.name}:grantPermissions`,
         `${this.subjectMetadataController.name}:getSubjectMetadata`,
         'ExecutionService:executeSnap',
@@ -3979,7 +3980,6 @@ export default class MetamaskController extends EventEmitter {
         sendMetrics: this.metaMetricsController.trackEvent.bind(
           this.metaMetricsController,
         ),
-
         // Permission-related
         getAccounts: this.getPermittedAccounts.bind(this, origin),
         getPermissionsForOrigin: this.permissionController.getPermissions.bind(
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 98e2ef7d2..116df79f1 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1392,7 +1392,7 @@
       "packages": {
         "@metamask/key-tree": true,
         "@metamask/key-tree>@noble/hashes": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
@@ -1410,18 +1410,6 @@
         "browserify>buffer": true
       }
     },
-    "@metamask/rpc-methods>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index a84edb962..ac03c7631 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1542,10 +1542,10 @@
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/rpc-methods>@metamask/browser-passworder": true,
         "@metamask/rpc-methods>@metamask/permission-controller": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/rpc-methods>nanoid": true,
         "@metamask/snaps-ui": true,
         "@metamask/snaps-utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>superstruct": true,
         "eth-rpc-errors": true
       }
@@ -1594,18 +1594,6 @@
         "ethjs>ethjs-unit": true
       }
     },
-    "@metamask/rpc-methods>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1669,7 +1657,6 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@metamask/subject-metadata-controller": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>gunzip-maybe": true,
@@ -1677,6 +1664,7 @@
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-utils": true,
+        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "json-rpc-middleware-stream": true,
@@ -1718,18 +1706,6 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "@metamask/snaps-controllers>concat-stream>readable-stream": true,
@@ -1878,22 +1854,10 @@
     },
     "@metamask/snaps-ui": {
       "packages": {
-        "@metamask/snaps-ui>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
-    "@metamask/snaps-ui>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "TextDecoder": true,
@@ -1907,27 +1871,15 @@
       "packages": {
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/snaps-utils>@metamask/utils": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "@metamask/snaps-utils>rfdc": true,
         "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
         "@metamask/utils>superstruct": true,
         "semver": true
       }
     },
-    "@metamask/snaps-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": 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 a84edb962..ac03c7631 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1542,10 +1542,10 @@
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/rpc-methods>@metamask/browser-passworder": true,
         "@metamask/rpc-methods>@metamask/permission-controller": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/rpc-methods>nanoid": true,
         "@metamask/snaps-ui": true,
         "@metamask/snaps-utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>superstruct": true,
         "eth-rpc-errors": true
       }
@@ -1594,18 +1594,6 @@
         "ethjs>ethjs-unit": true
       }
     },
-    "@metamask/rpc-methods>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1669,7 +1657,6 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@metamask/subject-metadata-controller": true,
-        "@metamask/snaps-controllers>@metamask/utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>gunzip-maybe": true,
@@ -1677,6 +1664,7 @@
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-utils": true,
+        "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
         "json-rpc-middleware-stream": true,
@@ -1718,18 +1706,6 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "@metamask/snaps-controllers>concat-stream>readable-stream": true,
@@ -1878,22 +1854,10 @@
     },
     "@metamask/snaps-ui": {
       "packages": {
-        "@metamask/snaps-ui>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
-    "@metamask/snaps-ui>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "TextDecoder": true,
@@ -1907,27 +1871,15 @@
       "packages": {
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/snaps-utils>@metamask/utils": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
         "@metamask/snaps-utils>rfdc": true,
         "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
         "@metamask/utils>superstruct": true,
         "semver": true
       }
     },
-    "@metamask/snaps-utils>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": 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 98e2ef7d2..116df79f1 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1392,7 +1392,7 @@
       "packages": {
         "@metamask/key-tree": true,
         "@metamask/key-tree>@noble/hashes": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
+        "@metamask/utils": true,
         "@metamask/utils>superstruct": true
       }
     },
@@ -1410,18 +1410,6 @@
         "browserify>buffer": true
       }
     },
-    "@metamask/rpc-methods>@metamask/utils": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
-      },
-      "packages": {
-        "@metamask/utils>superstruct": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true
-      }
-    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
diff --git a/package.json b/package.json
index f8957699d..cffda1384 100644
--- a/package.json
+++ b/package.json
@@ -237,7 +237,7 @@
     "@metamask/etherscan-link": "^2.2.0",
     "@metamask/gas-fee-controller": "^1.0.0",
     "@metamask/jazzicon": "^2.0.0",
-    "@metamask/key-tree": "^6.2.1",
+    "@metamask/key-tree": "^7.0.0",
     "@metamask/logo": "^3.1.1",
     "@metamask/metamask-eth-abis": "^3.0.0",
     "@metamask/notification-controller": "^1.0.0",
@@ -247,13 +247,13 @@
     "@metamask/post-message-stream": "^6.0.0",
     "@metamask/providers": "^10.2.1",
     "@metamask/rate-limit-controller": "^1.0.0",
-    "@metamask/rpc-methods": "^0.30.0",
+    "@metamask/rpc-methods": "^0.31.0",
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/slip44": "^2.1.0",
     "@metamask/smart-transactions-controller": "^3.1.0",
-    "@metamask/snaps-controllers": "^0.30.0",
-    "@metamask/snaps-ui": "^0.30.0",
-    "@metamask/snaps-utils": "^0.30.0",
+    "@metamask/snaps-controllers": "^0.31.0",
+    "@metamask/snaps-ui": "^0.31.0",
+    "@metamask/snaps-utils": "^0.31.0",
     "@metamask/subject-metadata-controller": "^1.0.0",
     "@metamask/utils": "^5.0.0",
     "@ngraveio/bc-ur": "^1.1.6",
diff --git a/test/e2e/snaps/enums.js b/test/e2e/snaps/enums.js
index c5992424c..c9dccd198 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/test-snaps/5.0.3/',
+  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/test-snaps/5.1.0/',
 };
diff --git a/test/e2e/snaps/test-snap-bip-32.spec.js b/test/e2e/snaps/test-snap-bip-32.spec.js
index e69cdce34..2a5174498 100644
--- a/test/e2e/snaps/test-snap-bip-32.spec.js
+++ b/test/e2e/snaps/test-snap-bip-32.spec.js
@@ -53,16 +53,8 @@ describe('Test Snap bip-32', function () {
           tag: 'button',
         });
 
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Approve & install' });
 
-        // switch to metamask extension
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
-
-        // approve install of snap
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
@@ -77,6 +69,13 @@ describe('Test Snap bip-32', function () {
           tag: 'button',
         });
 
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         // switch back to test-snaps window
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
diff --git a/test/e2e/snaps/test-snap-bip-44.spec.js b/test/e2e/snaps/test-snap-bip-44.spec.js
index ad12ac0ac..126ad5e5b 100644
--- a/test/e2e/snaps/test-snap-bip-44.spec.js
+++ b/test/e2e/snaps/test-snap-bip-44.spec.js
@@ -52,16 +52,8 @@ describe('Test Snap bip-44', function () {
           tag: 'button',
         });
 
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Approve & install' });
 
-        // switch to metamask extension
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
-
-        // approve install of snap
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
@@ -76,6 +68,13 @@ describe('Test Snap bip-44', function () {
           tag: 'button',
         });
 
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         // click send inputs on test snap page
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
diff --git a/test/e2e/snaps/test-snap-cronjob.spec.js b/test/e2e/snaps/test-snap-cronjob.spec.js
index d94d692ba..78a15490a 100644
--- a/test/e2e/snaps/test-snap-cronjob.spec.js
+++ b/test/e2e/snaps/test-snap-cronjob.spec.js
@@ -52,19 +52,20 @@ describe('Test Snap Cronjob', function () {
           tag: 'button',
         });
 
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Approve & install' });
 
-        // approve install of snap
-        windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         // click send inputs on test snap page
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
diff --git a/test/e2e/snaps/test-snap-dialog.spec.js b/test/e2e/snaps/test-snap-dialog.spec.js
index 4ca53ae22..031d14271 100644
--- a/test/e2e/snaps/test-snap-dialog.spec.js
+++ b/test/e2e/snaps/test-snap-dialog.spec.js
@@ -52,19 +52,20 @@ describe('Test Snap Dialog', function () {
           tag: 'button',
         });
 
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Approve & install' });
 
-        // approve install of snap
-        windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         // switch to test snaps tab
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
diff --git a/test/e2e/snaps/test-snap-error.spec.js b/test/e2e/snaps/test-snap-error.spec.js
index 2e72a9b92..a57f2241e 100644
--- a/test/e2e/snaps/test-snap-error.spec.js
+++ b/test/e2e/snaps/test-snap-error.spec.js
@@ -38,7 +38,7 @@ describe('Test Snap Error', function () {
         await driver.delay(1000);
 
         // switch to metamask extension and click connect
-        let windowHandles = await driver.waitUntilXWindowHandles(
+        const windowHandles = await driver.waitUntilXWindowHandles(
           3,
           1000,
           10000,
@@ -53,19 +53,20 @@ describe('Test Snap Error', function () {
           tag: 'button',
         });
 
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Approve & install' });
 
-        // approve install of snap
-        windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         // click send inputs on test snap page
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
diff --git a/test/e2e/snaps/test-snap-installed.spec.js b/test/e2e/snaps/test-snap-installed.spec.js
index 2645c9b00..c5adf1637 100644
--- a/test/e2e/snaps/test-snap-installed.spec.js
+++ b/test/e2e/snaps/test-snap-installed.spec.js
@@ -52,19 +52,20 @@ describe('Test Snap Installed', function () {
           tag: 'button',
         });
 
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Approve & install' });
 
-        // approve install of snap
-        windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         // click send inputs on test snap page
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
@@ -90,20 +91,20 @@ describe('Test Snap Installed', function () {
           tag: 'button',
         });
 
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Approve & install' });
 
-        // approve install of snap
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
         // wait for npm installation success
diff --git a/test/e2e/snaps/test-snap-management.spec.js b/test/e2e/snaps/test-snap-management.spec.js
index f66068b53..b8eab6b0b 100644
--- a/test/e2e/snaps/test-snap-management.spec.js
+++ b/test/e2e/snaps/test-snap-management.spec.js
@@ -54,21 +54,19 @@ describe('Test Snap Management', function () {
           tag: 'button',
         });
 
-        await driver.delay(1000);
+        await driver.waitForSelector({ text: 'Approve & install' });
 
-        // approve install of snap
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
 
         // switch to the original MM tab
         const extensionPage = windowHandles[0];
diff --git a/test/e2e/snaps/test-snap-managestate.spec.js b/test/e2e/snaps/test-snap-managestate.spec.js
index bbf2d5bcf..7e209d01a 100644
--- a/test/e2e/snaps/test-snap-managestate.spec.js
+++ b/test/e2e/snaps/test-snap-managestate.spec.js
@@ -41,7 +41,7 @@ describe('Test Snap manageState', function () {
         await driver.delay(1000);
 
         // switch to metamask extension and click connect
-        let windowHandles = await driver.waitUntilXWindowHandles(
+        const windowHandles = await driver.waitUntilXWindowHandles(
           2,
           1000,
           10000,
@@ -54,19 +54,21 @@ describe('Test Snap manageState', function () {
           text: 'Connect',
           tag: 'button',
         });
-        await driver.delay(2000);
 
-        // approve install of snap
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
+        await driver.waitForSelector({ text: 'Approve & install' });
+
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         // fill and click send inputs on test snap page
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
diff --git a/test/e2e/snaps/test-snap-notification.spec.js b/test/e2e/snaps/test-snap-notification.spec.js
index bf4ad409a..26809c18d 100644
--- a/test/e2e/snaps/test-snap-notification.spec.js
+++ b/test/e2e/snaps/test-snap-notification.spec.js
@@ -40,7 +40,7 @@ describe('Test Snap Notification', function () {
         await driver.delay(1000);
 
         // switch to metamask extension and click connect
-        let windowHandles = await driver.waitUntilXWindowHandles(
+        const windowHandles = await driver.waitUntilXWindowHandles(
           3,
           1000,
           10000,
@@ -54,19 +54,21 @@ describe('Test Snap Notification', function () {
           text: 'Connect',
           tag: 'button',
         });
-        await driver.delay(2000);
 
-        // approve install of snap
-        windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
+        await driver.waitForSelector({ text: 'Approve & install' });
+
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         // click send inputs on test snap page
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
diff --git a/test/e2e/snaps/test-snap-rpc.spec.js b/test/e2e/snaps/test-snap-rpc.spec.js
index 3f1716c5b..0f512c6fe 100644
--- a/test/e2e/snaps/test-snap-rpc.spec.js
+++ b/test/e2e/snaps/test-snap-rpc.spec.js
@@ -28,13 +28,15 @@ describe('Test Snap RPC', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
-        // navigate to test snaps page and connect
+        // navigate to test snaps page
         await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
         await driver.delay(1000);
-        const snapButton1 = await driver.findElement('#connectRpcSnap');
+
+        // find and scroll to the bip32 test and connect
+        const snapButton1 = await driver.findElement('#connectBip32');
         await driver.scrollToElement(snapButton1);
         await driver.delay(1000);
-        await driver.clickElement('#connectRpcSnap');
+        await driver.clickElement('#connectBip32');
         await driver.delay(1000);
 
         // switch to metamask extension and click connect
@@ -52,20 +54,62 @@ describe('Test Snap RPC', function () {
           tag: 'button',
         });
 
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Approve & install' });
+
+        await driver.clickElement({
+          text: 'Approve & install',
+          tag: 'button',
+        });
+
+        // wait for permissions popover, click checkboxes and confirm
+        await driver.delay(1000);
+        await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
+        await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+        });
+
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
+        // switch back to test-snaps window
+        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
+
+        const snapButton2 = await driver.findElement('#connectRpcSnap');
+        await driver.scrollToElement(snapButton2);
+        await driver.delay(1000);
+        await driver.clickElement('#connectRpcSnap');
+        await driver.delay(1000);
 
-        // approve install of snap
         windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle(
           'MetaMask Notification',
           windowHandles,
         );
+        await driver.clickElement({
+          text: 'Connect',
+          tag: 'button',
+        });
+
+        await driver.waitForSelector({ text: 'Approve & install' });
+
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
-        // switch back to test snaps page
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
         // wait for npm installation success
@@ -75,56 +119,14 @@ describe('Test Snap RPC', function () {
         });
 
         // click send inputs on test snap page
-        const snapButton2 = await driver.findElement('#sendRpc');
-        await driver.scrollToElement(snapButton2);
+        const snapButton3 = await driver.findElement('#sendRpc');
+        await driver.scrollToElement(snapButton3);
         await driver.delay(1000);
         await driver.clickElement('#sendRpc');
 
-        // approve and install part one
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({
-          text: 'Approve & install',
-          tag: 'button',
-        });
-
-        // wait for window to close
-        await driver.delay(2000);
-
-        // approve and install part two
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({
-          text: 'Approve & install',
-          tag: 'button',
-        });
-
-        // wait for permissions popover
-        await driver.waitForSelector({
-          text: 'Confirm',
-          tag: 'button',
-        });
-
-        // click checkboxes and confirm
-        await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
-        await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
-        await driver.clickElement({
-          text: 'Confirm',
-          tag: 'button',
-        });
-
         // delay for result creation
         await driver.delay(2500);
 
-        // check the results of the custom confirm
-        windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
-        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
         const confirmResult = await driver.findElement('#rpcResult');
         assert.equal(
           await confirmResult.getText(),
diff --git a/test/e2e/snaps/test-snap-txinsights.spec.js b/test/e2e/snaps/test-snap-txinsights.spec.js
index 4003501a6..b8fbe0063 100644
--- a/test/e2e/snaps/test-snap-txinsights.spec.js
+++ b/test/e2e/snaps/test-snap-txinsights.spec.js
@@ -53,26 +53,21 @@ describe('Test Snap TxInsights', function () {
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Approve & install' });
 
-        // switch to metamask extension
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
-
-        // approve install of snap
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
         });
 
-        await driver.delay(1000);
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
 
         // switch to test-snaps page and get accounts
-        windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
         await driver.clickElement('#getAccounts');
         await driver.delay(1000);
diff --git a/test/e2e/snaps/test-snap-update.spec.js b/test/e2e/snaps/test-snap-update.spec.js
index 472b5a1de..523356bac 100644
--- a/test/e2e/snaps/test-snap-update.spec.js
+++ b/test/e2e/snaps/test-snap-update.spec.js
@@ -53,14 +53,9 @@ describe('Test Snap update', function () {
           text: 'Connect',
           tag: 'button',
         });
-        await driver.delay(2000);
 
-        // approve install of snap
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
+        await driver.waitForSelector({ text: 'Approve & install' });
+
         await driver.clickElement({
           text: 'Approve & install',
           tag: 'button',
@@ -75,6 +70,13 @@ describe('Test Snap update', function () {
           tag: 'button',
         });
 
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
+
         // navigate to test snap page
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
@@ -101,16 +103,22 @@ describe('Test Snap update', function () {
           'MetaMask Notification',
           windowHandles,
         );
+
+        await driver.waitForSelector({ text: 'Approve & update' });
+
         await driver.clickElement({
           text: 'Approve & update',
           tag: 'button',
         });
 
-        // delay for npm installation
-        await driver.delay(2000);
+        await driver.waitForSelector({ text: 'Ok' });
+
+        await driver.clickElement({
+          text: 'Ok',
+          tag: 'button',
+        });
 
         // navigate to test snap page
-        windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
         // look for the correct version text
diff --git a/ui/components/app/flask/install-error/index.js b/ui/components/app/flask/install-error/index.js
new file mode 100644
index 000000000..b6c937ba2
--- /dev/null
+++ b/ui/components/app/flask/install-error/index.js
@@ -0,0 +1 @@
+export { default } from './install-error';
diff --git a/ui/components/app/flask/install-error/install-error.js b/ui/components/app/flask/install-error/install-error.js
new file mode 100644
index 000000000..39ecddf65
--- /dev/null
+++ b/ui/components/app/flask/install-error/install-error.js
@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Box from '../../../ui/box/box';
+import {
+  AlignItems,
+  BLOCK_SIZES,
+  FLEX_DIRECTION,
+  FONT_WEIGHT,
+  JustifyContent,
+  TextVariant,
+} from '../../../../helpers/constants/design-system';
+import ActionableMessage from '../../../ui/actionable-message/actionable-message';
+import { Text } from '../../../component-library';
+
+const InstallError = ({ title, error }) => {
+  return (
+    <Box
+      flexDirection={FLEX_DIRECTION.COLUMN}
+      alignItems={AlignItems.center}
+      justifyContent={JustifyContent.center}
+      height={BLOCK_SIZES.FULL}
+      padding={2}
+    >
+      <Text fontWeight={FONT_WEIGHT.BOLD} variant={TextVariant.headingLg}>
+        {title}
+      </Text>
+      <Box padding={2}>
+        <ActionableMessage type="danger" message={error} />
+      </Box>
+    </Box>
+  );
+};
+
+InstallError.propTypes = {
+  title: PropTypes.node.isRequired,
+  error: PropTypes.string.isRequired,
+};
+
+export default InstallError;
diff --git a/ui/components/app/flask/snap-install-warning/snap-install-warning.js b/ui/components/app/flask/snap-install-warning/snap-install-warning.js
index a5a7935c7..70cedf0d2 100644
--- a/ui/components/app/flask/snap-install-warning/snap-install-warning.js
+++ b/ui/components/app/flask/snap-install-warning/snap-install-warning.js
@@ -4,10 +4,14 @@ import { produce } from 'immer';
 import classnames from 'classnames';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import CheckBox from '../../../ui/check-box/check-box.component';
-import Typography from '../../../ui/typography/typography';
-import { TypographyVariant } from '../../../../helpers/constants/design-system';
+
+import {
+  TextVariant,
+  TEXT_ALIGN,
+} from '../../../../helpers/constants/design-system';
 import Popover from '../../../ui/popover';
 import Button from '../../../ui/button';
+import { Text } from '../../../component-library';
 
 /**
  * a very simple reducer using produce from Immer to keep checkboxes state manipulation
@@ -63,20 +67,23 @@ export default function SnapInstallWarning({ onCancel, onSubmit, warnings }) {
   return (
     <Popover
       className="snap-install-warning"
-      title={t('areYouSure')}
+      title={t('snapInstallWarningHeading')}
+      centerTitle
       footer={<SnapInstallWarningFooter />}
       headerProps={{ padding: [6, 6, 0] }}
-      contentProps={{ padding: [6, 4] }}
+      contentProps={{
+        paddingLeft: [6, 4],
+        paddingRight: [6, 4],
+        paddingTop: 0,
+        paddingBottom: [6, 4],
+      }}
       footerProps={{ padding: [4, 6] }}
     >
-      <Typography
-        variant={TypographyVariant.H6}
-        boxProps={{ paddingBottom: 4 }}
-      >
+      <Text paddingBottom={6} textAlign={TEXT_ALIGN.CENTER}>
         {warnings.length > 1
           ? t('snapInstallWarningCheckPlural')
           : t('snapInstallWarningCheck')}
-      </Typography>
+      </Text>
       {warnings.map((warning, i) => (
         <div
           className={classnames('checkbox-label', {
@@ -89,7 +96,9 @@ export default function SnapInstallWarning({ onCancel, onSubmit, warnings }) {
             id={warning.id}
             onClick={() => onCheckboxClicked(warning.id)}
           />
-          <label htmlFor={warning.id}>{warning.message}</label>
+          <label htmlFor={warning.id}>
+            <Text variant={TextVariant.bodySm}>{warning.message}</Text>
+          </label>
         </div>
       ))}
     </Popover>
diff --git a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
index 6a845f314..826f9c3ff 100644
--- a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
+++ b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
+import { getSnapPrefix } from '@metamask/snaps-utils';
 import Chip from '../../../ui/chip';
 import Box from '../../../ui/box';
 import Typography from '../../../ui/typography';
@@ -11,20 +12,18 @@ import {
   TextColor,
 } from '../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import { SNAPS_METADATA } from '../../../../../shared/constants/snaps';
-
-const snapIdPrefixes = ['npm:', 'local:'];
+import {
+  getSnapName,
+  removeSnapIdPrefix,
+} from '../../../../helpers/utils/util';
 
 const SnapsAuthorshipPill = ({ snapId, version, className }) => {
-  // @todo Use getSnapPrefix from snaps-monorepo when possible
   // We're using optional chaining with snapId, because with the current implementation
   // of snap update in the snap controller, we do not have reference to snapId when an
   // update request is rejected because the reference comes from the request itself and not subject metadata
   // like it is done with snap install
-  const snapPrefix = snapIdPrefixes.find((prefix) =>
-    snapId?.startsWith(prefix),
-  );
-  const packageName = snapId?.replace(snapPrefix, '');
+  const snapPrefix = snapId && getSnapPrefix(snapId);
+  const packageName = snapId && removeSnapIdPrefix(snapId);
   const isNPM = snapPrefix === 'npm:';
   const url = isNPM
     ? `https://www.npmjs.com/package/${packageName}`
@@ -32,7 +31,7 @@ const SnapsAuthorshipPill = ({ snapId, version, className }) => {
   const icon = isNPM ? 'fab fa-npm fa-lg' : 'fas fa-code';
   const t = useI18nContext();
 
-  const friendlyName = SNAPS_METADATA[snapId]?.name ?? packageName;
+  const friendlyName = getSnapName(snapId);
 
   return (
     <a
diff --git a/ui/helpers/constants/routes.ts b/ui/helpers/constants/routes.ts
index b9ee50321..8b206ed6d 100644
--- a/ui/helpers/constants/routes.ts
+++ b/ui/helpers/constants/routes.ts
@@ -36,6 +36,7 @@ const CONNECT_CONFIRM_PERMISSIONS_ROUTE = '/confirm-permissions';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 const CONNECT_SNAP_INSTALL_ROUTE = '/snap-install';
 const CONNECT_SNAP_UPDATE_ROUTE = '/snap-update';
+const CONNECT_SNAP_RESULT_ROUTE = '/snap-install-result';
 const NOTIFICATIONS_ROUTE = '/notifications';
 ///: END:ONLY_INCLUDE_IN
 const CONNECTED_ROUTE = '/connected';
@@ -211,6 +212,7 @@ export {
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   CONNECT_SNAP_INSTALL_ROUTE,
   CONNECT_SNAP_UPDATE_ROUTE,
+  CONNECT_SNAP_RESULT_ROUTE,
   NOTIFICATIONS_ROUTE,
   ///: END:ONLY_INCLUDE_IN
   CONNECTED_ROUTE,
diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js
index 763dddc1a..d33b88ce1 100644
--- a/ui/helpers/utils/permission.js
+++ b/ui/helpers/utils/permission.js
@@ -12,12 +12,15 @@ import {
   EndowmentPermissions,
   ///: END:ONLY_INCLUDE_IN
 } from '../../../shared/constants/permissions';
-///: BEGIN:ONLY_INCLUDE_IN(flask)
-import { SNAPS_METADATA } from '../../../shared/constants/snaps';
-///: END:ONLY_INCLUDE_IN
 import { Icon, ICON_NAMES } from '../../components/component-library';
 import { Color } from '../constants/design-system';
-import { coinTypeToProtocolName, getSnapDerivationPathName } from './util'; // eslint-disable-line no-unused-vars
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import {
+  coinTypeToProtocolName,
+  getSnapDerivationPathName,
+  getSnapName,
+} from './util';
+///: END:ONLY_INCLUDE_IN
 
 const UNKNOWN_PERMISSION = Symbol('unknown');
 
@@ -148,7 +151,7 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
       rightIcon: null,
     };
     return Object.keys(snaps).map((snapId) => {
-      const friendlyName = SNAPS_METADATA[snapId]?.name;
+      const friendlyName = getSnapName(snapId);
       if (friendlyName) {
         return {
           ...baseDescription,
diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index 27a38a649..52e306da5 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -7,6 +7,9 @@ import { getFormattedIpfsUrl } from '@metamask/assets-controllers';
 import slip44 from '@metamask/slip44';
 import * as lodash from 'lodash';
 import bowser from 'bowser';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import { getSnapPrefix } from '@metamask/snaps-utils';
+///: END:ONLY_INCLUDE_IN
 import { CHAIN_IDS } from '../../../shared/constants/network';
 import {
   toChecksumHexAddress,
@@ -20,7 +23,10 @@ import {
 import { Numeric } from '../../../shared/modules/Numeric';
 import { OUTDATED_BROWSER_VERSIONS } from '../constants/common';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
-import { SNAPS_DERIVATION_PATHS } from '../../../shared/constants/snaps';
+import {
+  SNAPS_DERIVATION_PATHS,
+  SNAPS_METADATA,
+} from '../../../shared/constants/snaps';
 ///: END:ONLY_INCLUDE_IN
 
 // formatData :: ( date: <Unix Timestamp> ) -> String
@@ -547,6 +553,12 @@ export function getSnapDerivationPathName(path, curve) {
 
   return pathMetadata?.name ?? null;
 }
+
+export const removeSnapIdPrefix = (snapId) =>
+  snapId.replace(getSnapPrefix(snapId), '');
+
+export const getSnapName = (snapId) =>
+  SNAPS_METADATA[snapId]?.name ?? removeSnapIdPrefix(snapId);
 ///: END:ONLY_INCLUDE_IN
 
 /**
diff --git a/ui/pages/permissions-connect/flask/snap-install/index.scss b/ui/pages/permissions-connect/flask/snap-install/index.scss
index 51f1342a7..dc725ce10 100644
--- a/ui/pages/permissions-connect/flask/snap-install/index.scss
+++ b/ui/pages/permissions-connect/flask/snap-install/index.scss
@@ -1,14 +1,27 @@
 .snap-install {
   box-shadow: none;
 
-  .permissions-connect-permission-list {
-    padding: 0 24px;
+  .headers {
+    flex: 1;
 
-    .permission {
-      padding: 8px 0;
+    .permissions-connect-permission-list {
+      padding: 0 24px;
+
+      .permission {
+        padding: 8px 0;
+      }
+    }
+
+    .loader-container {
+      height: 100%;
+    }
+
+    &__permission-description {
+      border-bottom: 1px solid var(--color-border-default);
     }
   }
 
+
   .page-container__footer {
     width: 100%;
     margin-top: 12px;
diff --git a/ui/pages/permissions-connect/flask/snap-install/snap-install.js b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
index 0cd060ae8..f8ee51949 100644
--- a/ui/pages/permissions-connect/flask/snap-install/snap-install.js
+++ b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
@@ -3,7 +3,6 @@ import React, { useCallback, useState } from 'react';
 import { PageContainerFooter } from '../../../../components/ui/page-container';
 import PermissionsConnectPermissionList from '../../../../components/app/permissions-connect-permission-list';
 import PermissionsConnectFooter from '../../../../components/app/permissions-connect-footer';
-import PermissionConnectHeader from '../../../../components/app/permissions-connect-header';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import SnapInstallWarning from '../../../../components/app/flask/snap-install-warning';
 import Box from '../../../../components/ui/box/box';
@@ -13,13 +12,20 @@ import {
   BorderStyle,
   FLEX_DIRECTION,
   JustifyContent,
-  TypographyVariant,
+  TextVariant,
+  TEXT_ALIGN,
 } from '../../../../helpers/constants/design-system';
-import Typography from '../../../../components/ui/typography';
 import { getSnapInstallWarnings } from '../util';
+import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader';
+import InstallError from '../../../../components/app/flask/install-error/install-error';
+import SnapsAuthorshipPill from '../../../../components/app/flask/snaps-authorship-pill/snaps-authorship-pill';
+import { Text } from '../../../../components/component-library';
+import { useOriginMetadata } from '../../../../hooks/useOriginMetadata';
+import { getSnapName } from '../../../../helpers/utils/util';
 
 export default function SnapInstall({
   request,
+  requestState,
   approveSnapInstall,
   rejectSnapInstall,
   targetSubjectMetadata,
@@ -27,6 +33,7 @@ export default function SnapInstall({
   const t = useI18nContext();
 
   const [isShowingWarning, setIsShowingWarning] = useState(false);
+  const originMetadata = useOriginMetadata(request.metadata?.dappOrigin) || {};
 
   const onCancel = useCallback(
     () => rejectSnapInstall(request.metadata.id),
@@ -38,17 +45,37 @@ export default function SnapInstall({
     [request, approveSnapInstall],
   );
 
+  const hasError = !requestState.loading && requestState.error;
+
+  const isLoading = requestState.loading;
+
   const hasPermissions =
-    request?.permissions && Object.keys(request.permissions).length > 0;
+    !hasError &&
+    requestState?.permissions &&
+    Object.keys(requestState.permissions).length > 0;
+
+  const isEmpty = !isLoading && !hasError && !hasPermissions;
 
   const warnings = getSnapInstallWarnings(
-    request?.permissions ?? {},
+    requestState?.permissions ?? {},
     targetSubjectMetadata,
     t,
   );
 
   const shouldShowWarning = warnings.length > 0;
 
+  const snapName = getSnapName(targetSubjectMetadata.origin);
+
+  const handleSubmit = () => {
+    if (!hasError && shouldShowWarning) {
+      setIsShowingWarning(true);
+    } else if (hasError) {
+      onCancel();
+    } else {
+      onSubmit();
+    }
+  };
+
   return (
     <Box
       className="page-container snap-install"
@@ -62,32 +89,66 @@ export default function SnapInstall({
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <PermissionConnectHeader
-          icon={targetSubjectMetadata.iconUrl}
-          iconName={targetSubjectMetadata.name}
-          headerTitle={t('snapInstall')}
-          headerText={null} // TODO(ritave): Add header text when snaps support description
-          siteOrigin={targetSubjectMetadata.origin}
-          isSnapInstallOrUpdate
-          snapVersion={targetSubjectMetadata.version}
-          boxProps={{ alignItems: AlignItems.center }}
+        <SnapsAuthorshipPill
+          snapId={targetSubjectMetadata.origin}
+          version={targetSubjectMetadata.version}
         />
+        {!hasError && (
+          <Text padding={[4, 4, 0, 4]} variant={TextVariant.headingLg}>
+            {t('snapInstall')}
+          </Text>
+        )}
+        {isLoading && (
+          <Box
+            className="loader-container"
+            flexDirection={FLEX_DIRECTION.COLUMN}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+          >
+            <PulseLoader />
+          </Box>
+        )}
+        {hasError && (
+          <InstallError error={requestState.error} title={t('requestFailed')} />
+        )}
         {hasPermissions && (
           <>
-            <Typography
-              boxProps={{
-                padding: [4, 4, 0, 4],
-              }}
-              variant={TypographyVariant.H7}
-              as="span"
+            <Text
+              className="headers__permission-description"
+              paddingLeft={4}
+              paddingRight={4}
+              paddingBottom={4}
+              textAlign={TEXT_ALIGN.CENTER}
             >
-              {t('snapRequestsPermission')}
-            </Typography>
+              {t('snapInstallRequestsPermission', [
+                <b key="1">{originMetadata?.hostname}</b>,
+                <b key="2">{snapName}</b>,
+              ])}
+            </Text>
             <PermissionsConnectPermissionList
-              permissions={request.permissions || {}}
+              permissions={requestState.permissions || {}}
             />
           </>
         )}
+        {isEmpty && (
+          <Box
+            flexDirection={FLEX_DIRECTION.COLUMN}
+            height={BLOCK_SIZES.FULL}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+          >
+            <Text
+              paddingLeft={4}
+              paddingRight={4}
+              textAlign={TEXT_ALIGN.CENTER}
+            >
+              {t('snapInstallRequest', [
+                <b key="1">{originMetadata?.hostname}</b>,
+                <b key="2">{snapName}</b>,
+              ])}
+            </Text>
+          </Box>
+        )}
       </Box>
       <Box
         className="footers"
@@ -99,12 +160,15 @@ export default function SnapInstall({
         </Box>
         <PageContainerFooter
           cancelButtonType="default"
+          hideCancel={hasError}
+          disabled={isLoading}
           onCancel={onCancel}
           cancelText={t('cancel')}
-          onSubmit={
-            shouldShowWarning ? () => setIsShowingWarning(true) : onSubmit
-          }
-          submitText={t(hasPermissions ? 'approveAndInstall' : 'install')}
+          onSubmit={handleSubmit}
+          submitText={t(
+            // eslint-disable-next-line no-nested-ternary
+            hasError ? 'ok' : hasPermissions ? 'approveAndInstall' : 'install',
+          )}
         />
       </Box>
       {isShowingWarning && (
@@ -120,6 +184,7 @@ export default function SnapInstall({
 
 SnapInstall.propTypes = {
   request: PropTypes.object.isRequired,
+  requestState: PropTypes.object.isRequired,
   approveSnapInstall: PropTypes.func.isRequired,
   rejectSnapInstall: PropTypes.func.isRequired,
   targetSubjectMetadata: PropTypes.shape({
diff --git a/ui/pages/permissions-connect/flask/snap-result/index.js b/ui/pages/permissions-connect/flask/snap-result/index.js
new file mode 100644
index 000000000..4da011e0b
--- /dev/null
+++ b/ui/pages/permissions-connect/flask/snap-result/index.js
@@ -0,0 +1 @@
+export { default } from './snap-result';
diff --git a/ui/pages/permissions-connect/flask/snap-result/index.scss b/ui/pages/permissions-connect/flask/snap-result/index.scss
new file mode 100644
index 000000000..2d130d4fe
--- /dev/null
+++ b/ui/pages/permissions-connect/flask/snap-result/index.scss
@@ -0,0 +1,16 @@
+.snap-result {
+  box-shadow: none;
+
+  .headers {
+    flex: 1;
+
+    .loader-container {
+      height: 100%;
+    }
+  }
+
+  .page-container__footer {
+    width: 100%;
+    margin-top: 12px;
+  }
+}
diff --git a/ui/pages/permissions-connect/flask/snap-result/snap-result.js b/ui/pages/permissions-connect/flask/snap-result/snap-result.js
new file mode 100644
index 000000000..68adb7993
--- /dev/null
+++ b/ui/pages/permissions-connect/flask/snap-result/snap-result.js
@@ -0,0 +1,128 @@
+import PropTypes from 'prop-types';
+import React, { useCallback } from 'react';
+import { PageContainerFooter } from '../../../../components/ui/page-container';
+
+import PermissionsConnectFooter from '../../../../components/app/permissions-connect-footer';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+
+import Box from '../../../../components/ui/box/box';
+import {
+  AlignItems,
+  BLOCK_SIZES,
+  BorderStyle,
+  FLEX_DIRECTION,
+  FONT_WEIGHT,
+  JustifyContent,
+  TextVariant,
+  TEXT_ALIGN,
+} from '../../../../helpers/constants/design-system';
+import { Text } from '../../../../components/component-library';
+import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader';
+import InstallError from '../../../../components/app/flask/install-error/install-error';
+import SnapsAuthorshipPill from '../../../../components/app/flask/snaps-authorship-pill/snaps-authorship-pill';
+import { getSnapName } from '../../../../helpers/utils/util';
+
+export default function SnapResult({
+  request,
+  requestState,
+  approveSnapResult,
+  targetSubjectMetadata,
+}) {
+  const t = useI18nContext();
+
+  const onSubmit = useCallback(
+    () => approveSnapResult(request.metadata.id),
+    [request, approveSnapResult],
+  );
+
+  const hasError = !requestState.loading && requestState.error;
+
+  const isLoading = requestState.loading;
+
+  const snapName = getSnapName(targetSubjectMetadata.origin);
+
+  return (
+    <Box
+      className="page-container snap-result"
+      justifyContent={JustifyContent.spaceBetween}
+      height={BLOCK_SIZES.FULL}
+      borderStyle={BorderStyle.none}
+      flexDirection={FLEX_DIRECTION.COLUMN}
+    >
+      <Box
+        className="headers"
+        alignItems={AlignItems.center}
+        flexDirection={FLEX_DIRECTION.COLUMN}
+      >
+        <SnapsAuthorshipPill
+          snapId={targetSubjectMetadata.origin}
+          version={targetSubjectMetadata.version}
+        />
+        {isLoading && (
+          <Box
+            className="loader-container"
+            flexDirection={FLEX_DIRECTION.COLUMN}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+          >
+            <PulseLoader />
+          </Box>
+        )}
+        {!isLoading && !hasError && (
+          <Box
+            flexDirection={FLEX_DIRECTION.COLUMN}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+            height={BLOCK_SIZES.FULL}
+            padding={2}
+          >
+            <Text
+              fontWeight={FONT_WEIGHT.BOLD}
+              variant={TextVariant.headingLg}
+              paddingBottom={2}
+            >
+              {t('snapResultSuccess')}
+            </Text>
+            <Text textAlign={TEXT_ALIGN.CENTER}>
+              {t('snapResultSuccessDescription', [<b key="1">{snapName}</b>])}
+            </Text>
+          </Box>
+        )}
+        {hasError && (
+          <InstallError
+            error={requestState.error}
+            title={t('snapResultError')}
+          />
+        )}
+      </Box>
+      <Box
+        className="footers"
+        alignItems={AlignItems.center}
+        flexDirection={FLEX_DIRECTION.COLUMN}
+      >
+        <Box className="snap-install__footer--no-source-code" paddingTop={4}>
+          <PermissionsConnectFooter />
+        </Box>
+        <PageContainerFooter
+          hideCancel
+          disabled={isLoading}
+          onSubmit={onSubmit}
+          submitText={t('ok')}
+        />
+      </Box>
+    </Box>
+  );
+}
+
+SnapResult.propTypes = {
+  request: PropTypes.object.isRequired,
+  requestState: PropTypes.object.isRequired,
+  approveSnapResult: PropTypes.func.isRequired,
+  targetSubjectMetadata: PropTypes.shape({
+    iconUrl: PropTypes.string,
+    name: PropTypes.string,
+    origin: PropTypes.string.isRequired,
+    sourceCode: PropTypes.string,
+    version: PropTypes.string,
+  }).isRequired,
+};
diff --git a/ui/pages/permissions-connect/flask/snap-update/index.scss b/ui/pages/permissions-connect/flask/snap-update/index.scss
index bc6f8c51a..31e81420c 100644
--- a/ui/pages/permissions-connect/flask/snap-update/index.scss
+++ b/ui/pages/permissions-connect/flask/snap-update/index.scss
@@ -1,13 +1,25 @@
 .snap-update {
   box-shadow: none;
 
-  .update-snap-permission-list {
-    padding: 0 24px;
+  .headers {
+    flex: 1;
 
-    .new-permission,
-    .approved-permission,
-    .revoked-permission {
-      padding: 8px 0;
+    .loader-container {
+      height: 100%;
+    }
+
+    .update-snap-permission-list {
+      padding: 0 24px;
+
+      .new-permission,
+      .approved-permission,
+      .revoked-permission {
+        padding: 8px 0;
+      }
+    }
+
+    &__permission-description {
+      border-bottom: 1px solid var(--color-border-default);
     }
   }
 
diff --git a/ui/pages/permissions-connect/flask/snap-update/snap-update.js b/ui/pages/permissions-connect/flask/snap-update/snap-update.js
index 0a030987c..87b56f262 100644
--- a/ui/pages/permissions-connect/flask/snap-update/snap-update.js
+++ b/ui/pages/permissions-connect/flask/snap-update/snap-update.js
@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React, { useCallback, useState } from 'react';
 import { PageContainerFooter } from '../../../../components/ui/page-container';
 import PermissionsConnectFooter from '../../../../components/app/permissions-connect-footer';
-import PermissionConnectHeader from '../../../../components/app/permissions-connect-header';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import SnapInstallWarning from '../../../../components/app/flask/snap-install-warning';
 import Box from '../../../../components/ui/box/box';
@@ -12,14 +11,22 @@ import {
   BorderStyle,
   FLEX_DIRECTION,
   JustifyContent,
-  TypographyVariant,
+  TextVariant,
+  TEXT_ALIGN,
 } from '../../../../helpers/constants/design-system';
-import Typography from '../../../../components/ui/typography';
+
 import UpdateSnapPermissionList from '../../../../components/app/flask/update-snap-permission-list';
 import { getSnapInstallWarnings } from '../util';
+import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader';
+import InstallError from '../../../../components/app/flask/install-error/install-error';
+import SnapsAuthorshipPill from '../../../../components/app/flask/snaps-authorship-pill/snaps-authorship-pill';
+import { Text } from '../../../../components/component-library';
+import { useOriginMetadata } from '../../../../hooks/useOriginMetadata';
+import { getSnapName } from '../../../../helpers/utils/util';
 
 export default function SnapUpdate({
   request,
+  requestState,
   approveSnapUpdate,
   rejectSnapUpdate,
   targetSubjectMetadata,
@@ -27,6 +34,7 @@ export default function SnapUpdate({
   const t = useI18nContext();
 
   const [isShowingWarning, setIsShowingWarning] = useState(false);
+  const originMetadata = useOriginMetadata(request.metadata?.dappOrigin) || {};
 
   const onCancel = useCallback(
     () => rejectSnapUpdate(request.metadata.id),
@@ -38,14 +46,21 @@ export default function SnapUpdate({
     [request, approveSnapUpdate],
   );
 
-  const approvedPermissions = request.approvedPermissions ?? {};
-  const revokedPermissions = request.unusedPermissions ?? {};
-  const newPermissions = request.newPermissions ?? {};
+  const approvedPermissions = requestState.approvedPermissions ?? {};
+  const revokedPermissions = requestState.unusedPermissions ?? {};
+  const newPermissions = requestState.newPermissions ?? {};
+
+  const isLoading = requestState.loading;
+  const hasError = !isLoading && requestState.error;
+
   const hasPermissions =
+    !hasError &&
     Object.keys(approvedPermissions).length +
       Object.keys(revokedPermissions).length +
       Object.keys(newPermissions).length >
-    0;
+      0;
+
+  const isEmpty = !isLoading && !hasError && !hasPermissions;
 
   const warnings = getSnapInstallWarnings(
     newPermissions,
@@ -55,6 +70,18 @@ export default function SnapUpdate({
 
   const shouldShowWarning = warnings.length > 0;
 
+  const snapName = getSnapName(targetSubjectMetadata.origin);
+
+  const handleSubmit = () => {
+    if (!hasError && shouldShowWarning) {
+      setIsShowingWarning(true);
+    } else if (hasError) {
+      onCancel();
+    } else {
+      onSubmit();
+    }
+  };
+
   return (
     <Box
       className="page-container snap-update"
@@ -68,36 +95,42 @@ export default function SnapUpdate({
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <PermissionConnectHeader
-          icon={targetSubjectMetadata.iconUrl}
-          iconName={targetSubjectMetadata.name}
-          headerTitle={t('snapUpdate')}
-          headerText={null} // TODO(ritave): Add header text when snaps support description
-          siteOrigin={request.snapId}
-          isSnapInstallOrUpdate
-          snapVersion={request.newVersion}
-          boxProps={{ alignItems: AlignItems.center }}
+        <SnapsAuthorshipPill
+          snapId={targetSubjectMetadata.origin}
+          version={requestState.newVersion}
         />
-        <Typography
-          boxProps={{
-            padding: [4, 4, 0, 4],
-          }}
-          variant={TypographyVariant.H7}
-          as="span"
-        >
-          {t('snapUpdateExplanation', [`${request.metadata.dappOrigin}`])}
-        </Typography>
+        {!hasError && (
+          <Text padding={[4, 4, 0, 4]} variant={TextVariant.headingLg}>
+            {t('snapUpdate')}
+          </Text>
+        )}
+        {isLoading && (
+          <Box
+            className="loader-container"
+            flexDirection={FLEX_DIRECTION.COLUMN}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+          >
+            <PulseLoader />
+          </Box>
+        )}
+        {hasError && (
+          <InstallError error={requestState.error} title={t('requestFailed')} />
+        )}
         {hasPermissions && (
           <>
-            <Typography
-              boxProps={{
-                padding: [2, 4, 0, 4],
-              }}
-              variant={TypographyVariant.H7}
-              as="span"
+            <Text
+              className="headers__permission-description"
+              paddingLeft={4}
+              paddingRight={4}
+              paddingBottom={4}
+              textAlign={TEXT_ALIGN.CENTER}
             >
-              {t('snapRequestsPermission')}
-            </Typography>
+              {t('snapUpdateRequestsPermission', [
+                <b key="1">{originMetadata?.hostname}</b>,
+                <b key="2">{snapName}</b>,
+              ])}
+            </Text>
             <UpdateSnapPermissionList
               approvedPermissions={approvedPermissions}
               revokedPermissions={revokedPermissions}
@@ -105,6 +138,25 @@ export default function SnapUpdate({
             />
           </>
         )}
+        {isEmpty && (
+          <Box
+            flexDirection={FLEX_DIRECTION.COLUMN}
+            height={BLOCK_SIZES.FULL}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+          >
+            <Text
+              paddingLeft={4}
+              paddingRight={4}
+              textAlign={TEXT_ALIGN.CENTER}
+            >
+              {t('snapUpdateRequest', [
+                <b key="1">{originMetadata?.hostname}</b>,
+                <b key="2">{snapName}</b>,
+              ])}
+            </Text>
+          </Box>
+        )}
       </Box>
       <Box
         className="footers"
@@ -116,12 +168,15 @@ export default function SnapUpdate({
         </Box>
         <PageContainerFooter
           cancelButtonType="default"
+          hideCancel={hasError}
+          disabled={isLoading}
           onCancel={onCancel}
           cancelText={t('cancel')}
-          onSubmit={
-            shouldShowWarning ? () => setIsShowingWarning(true) : onSubmit
-          }
-          submitText={t('approveAndUpdate')}
+          onSubmit={handleSubmit}
+          submitText={t(
+            // eslint-disable-next-line no-nested-ternary
+            hasError ? 'ok' : hasPermissions ? 'approveAndUpdate' : 'update',
+          )}
         />
       </Box>
       {isShowingWarning && (
@@ -138,6 +193,7 @@ export default function SnapUpdate({
 
 SnapUpdate.propTypes = {
   request: PropTypes.object.isRequired,
+  requestState: PropTypes.object.isRequired,
   approveSnapUpdate: PropTypes.func.isRequired,
   rejectSnapUpdate: PropTypes.func.isRequired,
   targetSubjectMetadata: PropTypes.shape({
diff --git a/ui/pages/permissions-connect/flask/util.js b/ui/pages/permissions-connect/flask/util.js
index ddea93342..8c3ad9364 100644
--- a/ui/pages/permissions-connect/flask/util.js
+++ b/ui/pages/permissions-connect/flask/util.js
@@ -1,5 +1,16 @@
-import { flatMap } from '@metamask/snaps-utils';
-import { coinTypeToProtocolName } from '../../../helpers/utils/util';
+import React from 'react';
+import { Text } from '../../../components/component-library';
+import {
+  Color,
+  FONT_WEIGHT,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+
+import {
+  coinTypeToProtocolName,
+  getSnapName,
+  getSnapDerivationPathName,
+} from '../../../helpers/utils/util';
 
 export function getSnapInstallWarnings(permissions, targetSubjectMetadata, t) {
   const bip32EntropyPermissions =
@@ -15,24 +26,45 @@ export function getSnapInstallWarnings(permissions, targetSubjectMetadata, t) {
       .map(([, value]) => value);
 
   return [
-    ...flatMap(bip32EntropyPermissions, (permission, i) =>
+    ...bip32EntropyPermissions.flatMap((permission, i) =>
       permission.caveats[0].value.map(({ path, curve }) => ({
         id: `key-access-bip32-${path
           .join('-')
           .replace(/'/gu, 'h')}-${curve}-${i}`,
         message: t('snapInstallWarningKeyAccess', [
-          targetSubjectMetadata.name,
-          `${path.join('/')} (${curve})`,
+          <Text
+            key="1"
+            color={Color.primaryDefault}
+            fontWeight={FONT_WEIGHT.BOLD}
+            variant={TextVariant.bodySm}
+            as="span"
+          >
+            {getSnapName(targetSubjectMetadata.origin)}
+          </Text>,
+          <b key="2">
+            {getSnapDerivationPathName(path, curve) ??
+              `${path.join('/')} (${curve})`}
+          </b>,
         ]),
       })),
     ),
-    ...flatMap(bip44EntropyPermissions, (permission, i) =>
+    ...bip44EntropyPermissions.flatMap((permission, i) =>
       permission.caveats[0].value.map(({ coinType }) => ({
         id: `key-access-bip44-${coinType}-${i}`,
         message: t('snapInstallWarningKeyAccess', [
-          targetSubjectMetadata.name,
-          coinTypeToProtocolName(coinType) ||
-            t('unrecognizedProtocol', [coinType]),
+          <Text
+            key="1"
+            color={Color.primaryDefault}
+            fontWeight={FONT_WEIGHT.BOLD}
+            variant={TextVariant.bodySm}
+            as="span"
+          >
+            {getSnapName(targetSubjectMetadata.origin)}
+          </Text>,
+          <b key="2">
+            {coinTypeToProtocolName(coinType) ||
+              t('unrecognizedProtocol', [coinType])}
+          </b>,
         ]),
       })),
     ),
diff --git a/ui/pages/permissions-connect/index.scss b/ui/pages/permissions-connect/index.scss
index 1ca3c116a..358f93a2e 100644
--- a/ui/pages/permissions-connect/index.scss
+++ b/ui/pages/permissions-connect/index.scss
@@ -1,6 +1,7 @@
 @import 'choose-account/index';
 @import 'flask/snap-install/index';
 @import 'flask/snap-update/index';
+@import 'flask/snap-result/index';
 @import 'redirect/index';
 
 .permissions-connect {
diff --git a/ui/pages/permissions-connect/permissions-connect.component.js b/ui/pages/permissions-connect/permissions-connect.component.js
index 28c7b373e..b5435d489 100644
--- a/ui/pages/permissions-connect/permissions-connect.component.js
+++ b/ui/pages/permissions-connect/permissions-connect.component.js
@@ -19,6 +19,7 @@ import PermissionsRedirect from './redirect';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 import SnapInstall from './flask/snap-install';
 import SnapUpdate from './flask/snap-update';
+import SnapResult from './flask/snap-result';
 ///: END:ONLY_INCLUDE_IN
 
 const APPROVE_TIMEOUT = MILLISECOND * 1200;
@@ -44,7 +45,9 @@ export default class PermissionConnect extends Component {
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     snapInstallPath: PropTypes.string.isRequired,
     snapUpdatePath: PropTypes.string.isRequired,
-    isSnap: PropTypes.bool.isRequired,
+    snapResultPath: PropTypes.string.isRequired,
+    requestType: PropTypes.string.isRequired,
+    requestState: PropTypes.object.isRequired,
     approvePendingApproval: PropTypes.func.isRequired,
     rejectPendingApproval: PropTypes.func.isRequired,
     ///: END:ONLY_INCLUDE_IN
@@ -102,7 +105,8 @@ export default class PermissionConnect extends Component {
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
       snapInstallPath,
       snapUpdatePath,
-      isSnap,
+      snapResultPath,
+      requestType,
       ///: END:ONLY_INCLUDE_IN
       getRequestAccountTabIds,
       permissionsRequest,
@@ -123,13 +127,20 @@ export default class PermissionConnect extends Component {
 
     if (history.location.pathname === connectPath && !isRequestingAccounts) {
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
-      if (isSnap) {
-        history.push(
-          permissionsRequest.newPermissions ? snapUpdatePath : snapInstallPath,
-        );
-      } else {
-        ///: END:ONLY_INCLUDE_IN
-        history.push(confirmPermissionPath);
+
+      switch (requestType) {
+        case 'wallet_installSnap':
+          history.push(snapInstallPath);
+          break;
+        case 'wallet_updateSnap':
+          history.push(snapUpdatePath);
+          break;
+        case 'wallet_installSnapResult':
+          history.push(snapResultPath);
+          break;
+        default:
+          ///: END:ONLY_INCLUDE_IN
+          history.push(confirmPermissionPath);
         ///: BEGIN:ONLY_INCLUDE_IN(flask)
       }
       ///: END:ONLY_INCLUDE_IN
@@ -171,8 +182,8 @@ export default class PermissionConnect extends Component {
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
       snapInstallPath,
       snapUpdatePath,
-      isSnap,
-      permissionsRequest,
+      snapResultPath,
+      requestType,
       ///: END:ONLY_INCLUDE_IN
     } = this.props;
     this.setState(
@@ -183,30 +194,65 @@ export default class PermissionConnect extends Component {
       () => this.props.history.push(confirmPermissionPath),
       ///: END:ONLY_INCLUDE_IN
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
-      () =>
-        this.props.history.push(
-          // eslint-disable-next-line no-nested-ternary
-          isSnap
-            ? permissionsRequest.newPermissions
-              ? snapUpdatePath
-              : snapInstallPath
-            : confirmPermissionPath,
-        ),
+      () => {
+        switch (requestType) {
+          case 'wallet_installSnap':
+            this.props.history.push(snapInstallPath);
+            break;
+          case 'wallet_updateSnap':
+            this.props.history.push(snapUpdatePath);
+            break;
+          case 'wallet_installSnapResult':
+            this.props.history.push(snapResultPath);
+            break;
+          default:
+            this.props.history.push(confirmPermissionPath);
+        }
+      },
       ///: END:ONLY_INCLUDE_IN
     );
   };
 
   redirect(approved) {
-    const { history } = this.props;
+    const {
+      history,
+      ///: BEGIN:ONLY_INCLUDE_IN(flask)
+      permissionsRequest,
+      ///: END:ONLY_INCLUDE_IN
+    } = this.props;
+
+    ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    const isRequestingSnap =
+      permissionsRequest?.permissions &&
+      Object.keys(permissionsRequest.permissions).includes('wallet_snap');
+
+    const shouldRedirect = !isRequestingSnap;
+
+    this.setState({
+      redirecting: shouldRedirect,
+      permissionsApproved: approved,
+    });
+    ///: END:ONLY_INCLUDE_IN
+
+    ///: BEGIN:ONLY_INCLUDE_IN(main,beta)
     this.setState({
       redirecting: true,
       permissionsApproved: approved,
     });
+    ///: END:ONLY_INCLUDE_IN
     this.removeBeforeUnload();
 
+    ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    if (shouldRedirect && approved) {
+      setTimeout(() => history.push(DEFAULT_ROUTE), APPROVE_TIMEOUT);
+    }
+    ///: END:ONLY_INCLUDE_IN
+    ///: BEGIN:ONLY_INCLUDE_IN(main,beta)
     if (approved) {
       setTimeout(() => history.push(DEFAULT_ROUTE), APPROVE_TIMEOUT);
-    } else {
+    }
+    ///: END:ONLY_INCLUDE_IN
+    else {
       history.push(DEFAULT_ROUTE);
     }
   }
@@ -268,6 +314,8 @@ export default class PermissionConnect extends Component {
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
       snapInstallPath,
       snapUpdatePath,
+      snapResultPath,
+      requestState,
       approvePendingApproval,
       rejectPendingApproval,
       ///: END:ONLY_INCLUDE_IN
@@ -340,19 +388,22 @@ export default class PermissionConnect extends Component {
               render={() => (
                 <SnapInstall
                   request={permissionsRequest || {}}
+                  requestState={requestState || {}}
                   approveSnapInstall={(requestId) => {
                     approvePendingApproval(requestId, {
                       ...permissionsRequest,
+                      permissions: requestState.permissions,
                       approvedAccounts: [...selectedAccountAddresses],
                     });
-                    this.redirect(true);
+                    this.setState({ permissionsApproved: true });
                   }}
                   rejectSnapInstall={(requestId) => {
                     rejectPendingApproval(
                       requestId,
                       serializeError(ethErrors.provider.userRejectedRequest()),
                     );
-                    this.redirect(false);
+                    this.setState({ permissionsApproved: true });
+                    this.removeBeforeUnload();
                   }}
                   targetSubjectMetadata={targetSubjectMetadata}
                 />
@@ -370,19 +421,44 @@ export default class PermissionConnect extends Component {
               render={() => (
                 <SnapUpdate
                   request={permissionsRequest || {}}
+                  requestState={requestState || {}}
                   approveSnapUpdate={(requestId) => {
                     approvePendingApproval(requestId, {
                       ...permissionsRequest,
+                      permissions: requestState.permissions,
                       approvedAccounts: [...selectedAccountAddresses],
                     });
-                    this.redirect(true);
+                    this.setState({ permissionsApproved: true });
                   }}
                   rejectSnapUpdate={(requestId) => {
                     rejectPendingApproval(
                       requestId,
                       serializeError(ethErrors.provider.userRejectedRequest()),
                     );
-                    this.redirect(false);
+                    this.setState({ permissionsApproved: false });
+                    this.removeBeforeUnload();
+                  }}
+                  targetSubjectMetadata={targetSubjectMetadata}
+                />
+              )}
+            />
+            {
+              ///: END:ONLY_INCLUDE_IN
+            }
+            {
+              ///: BEGIN:ONLY_INCLUDE_IN(flask)
+            }
+            <Route
+              path={snapResultPath}
+              exact
+              render={() => (
+                <SnapResult
+                  request={permissionsRequest || {}}
+                  requestState={requestState || {}}
+                  approveSnapResult={(requestId) => {
+                    approvePendingApproval(requestId);
+                    this.setState({ permissionsApproved: true });
+                    this.removeBeforeUnload();
                   }}
                   targetSubjectMetadata={targetSubjectMetadata}
                 />
diff --git a/ui/pages/permissions-connect/permissions-connect.container.js b/ui/pages/permissions-connect/permissions-connect.container.js
index 98e6e9511..c72db67e0 100644
--- a/ui/pages/permissions-connect/permissions-connect.container.js
+++ b/ui/pages/permissions-connect/permissions-connect.container.js
@@ -8,6 +8,8 @@ import {
   getSelectedAddress,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   getSnapInstallOrUpdateRequests,
+  getRequestState,
+  getRequestType,
   ///: END:ONLY_INCLUDE_IN
   getTargetSubjectMetadata,
 } from '../../selectors';
@@ -30,6 +32,7 @@ import {
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   CONNECT_SNAP_INSTALL_ROUTE,
   CONNECT_SNAP_UPDATE_ROUTE,
+  CONNECT_SNAP_RESULT_ROUTE,
   ///: END:ONLY_INCLUDE_IN
 } from '../../helpers/constants/routes';
 import PermissionApproval from './permissions-connect.component';
@@ -72,6 +75,10 @@ const mapStateToProps = (state, ownProps) => {
 
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   const isSnap = targetSubjectMetadata.subjectType === SubjectType.Snap;
+
+  const requestType = getRequestType(state, permissionsRequestId);
+
+  const requestState = getRequestState(state, permissionsRequestId);
   ///: END:ONLY_INCLUDE_IN
 
   const accountsWithLabels = getAccountsWithLabels(state);
@@ -91,6 +98,7 @@ const mapStateToProps = (state, ownProps) => {
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   const snapInstallPath = `${CONNECT_ROUTE}/${permissionsRequestId}${CONNECT_SNAP_INSTALL_ROUTE}`;
   const snapUpdatePath = `${CONNECT_ROUTE}/${permissionsRequestId}${CONNECT_SNAP_UPDATE_ROUTE}`;
+  const snapResultPath = `${CONNECT_ROUTE}/${permissionsRequestId}${CONNECT_SNAP_RESULT_ROUTE}`;
   ///: END:ONLY_INCLUDE_IN
 
   let totalPages = 1 + isRequestingAccounts;
@@ -105,7 +113,11 @@ const mapStateToProps = (state, ownProps) => {
   } else if (pathname === confirmPermissionPath) {
     page = isRequestingAccounts ? '2' : '1';
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  } else if (pathname === snapInstallPath || pathname === snapUpdatePath) {
+  } else if (
+    pathname === snapInstallPath ||
+    pathname === snapUpdatePath ||
+    pathname === snapResultPath
+  ) {
     page = isRequestingAccounts ? '3' : '2';
     ///: END:ONLY_INCLUDE_IN
   } else {
@@ -115,9 +127,12 @@ const mapStateToProps = (state, ownProps) => {
   return {
     isRequestingAccounts,
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    isSnap,
+    requestType,
     snapInstallPath,
     snapUpdatePath,
+    snapResultPath,
+    requestState,
+    isSnap,
     ///: END:ONLY_INCLUDE_IN
     permissionsRequest,
     permissionsRequestId,
diff --git a/ui/selectors/permissions.js b/ui/selectors/permissions.js
index b9113a6e6..27f5c4c88 100644
--- a/ui/selectors/permissions.js
+++ b/ui/selectors/permissions.js
@@ -310,7 +310,9 @@ export function getSnapInstallOrUpdateRequests(state) {
   return Object.values(state.metamask.pendingApprovals)
     .filter(
       ({ type }) =>
-        type === 'wallet_installSnap' || type === 'wallet_updateSnap',
+        type === 'wallet_installSnap' ||
+        type === 'wallet_updateSnap' ||
+        type === 'wallet_installSnapResult',
     )
     .map(({ requestData }) => requestData);
 }
@@ -334,3 +336,11 @@ export function getFirstPermissionRequest(state) {
 export function getPermissions(state, origin) {
   return getPermissionSubjects(state)[origin]?.permissions;
 }
+
+export function getRequestState(state, id) {
+  return state.metamask.pendingApprovals[id]?.requestState;
+}
+
+export function getRequestType(state, id) {
+  return state.metamask.pendingApprovals[id]?.type;
+}
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 6edae5f14..a71cdb62e 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -3696,6 +3696,7 @@ export function approvePermissionsRequest(
       if (err) {
         dispatch(displayWarning(err));
       }
+      forceUpdateMetamaskState(dispatch);
     });
   };
 }
diff --git a/yarn.lock b/yarn.lock
index e05d1c415..a23a32235 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4002,9 +4002,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/key-tree@npm:^6.2.1":
-  version: 6.2.1
-  resolution: "@metamask/key-tree@npm:6.2.1"
+"@metamask/key-tree@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@metamask/key-tree@npm:7.0.0"
   dependencies:
     "@metamask/scure-bip39": ^2.1.0
     "@metamask/utils": ^3.3.0
@@ -4012,7 +4012,7 @@ __metadata:
     "@noble/hashes": ^1.0.0
     "@noble/secp256k1": ^1.5.5
     "@scure/base": ^1.0.0
-  checksum: 78931e20a2c933535c17d21e092dbc66e3e96f3c171a6814af51830b7774dd3b4059326180a3b1f52e48a258254a7ea70a31d0c335bf24a8c4250f8d196bc7ba
+  checksum: e3b8371ba41766e1936ff0b0b34c46b7a1297e51fe177246ae6446c4f15a6601a6ed4fc5d01d0594e8b1e9b1682096900f7ab4e7e15df94041ec025116a635b9
   languageName: node
   linkType: hard
 
@@ -4267,22 +4267,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/rpc-methods@npm:^0.30.0":
-  version: 0.30.0
-  resolution: "@metamask/rpc-methods@npm:0.30.0"
+"@metamask/rpc-methods@npm:^0.31.0":
+  version: 0.31.0
+  resolution: "@metamask/rpc-methods@npm:0.31.0"
   dependencies:
     "@metamask/browser-passworder": ^4.0.2
-    "@metamask/key-tree": ^6.2.1
+    "@metamask/key-tree": ^7.0.0
     "@metamask/permission-controller": ^3.0.0
-    "@metamask/snaps-ui": ^0.30.0
-    "@metamask/snaps-utils": ^0.30.0
+    "@metamask/snaps-ui": ^0.31.0
+    "@metamask/snaps-utils": ^0.31.0
     "@metamask/types": ^1.1.0
-    "@metamask/utils": ^3.4.1
+    "@metamask/utils": ^5.0.0
     "@noble/hashes": ^1.1.3
     eth-rpc-errors: ^4.0.2
     nanoid: ^3.1.31
     superstruct: ^1.0.3
-  checksum: ae584a2ea403653199c17e4fe43bdf26d25f2dbab8609e48f85d6a1def762526370e145cf69dc5649ee501f6e170ea27161b3d908c62ff1e9617af5e23564793
+  checksum: 73e7271279a3eff43f5bca46343d582a3f90f2eda3c8e4dcfc46e01f097be2222decf8a4d66aee3a8fc4fdc1b15de176460ea0f2a87ec99889a2c5456800879c
   languageName: node
   linkType: hard
 
@@ -4329,21 +4329,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^0.30.0":
-  version: 0.30.0
-  resolution: "@metamask/snaps-controllers@npm:0.30.0"
+"@metamask/snaps-controllers@npm:^0.31.0":
+  version: 0.31.0
+  resolution: "@metamask/snaps-controllers@npm:0.31.0"
   dependencies:
     "@metamask/approval-controller": ^2.0.0
     "@metamask/base-controller": ^2.0.0
     "@metamask/object-multiplex": ^1.1.0
     "@metamask/permission-controller": ^3.0.0
     "@metamask/post-message-stream": ^6.1.0
-    "@metamask/rpc-methods": ^0.30.0
-    "@metamask/snaps-execution-environments": ^0.30.0
-    "@metamask/snaps-registry": ^1.1.0
-    "@metamask/snaps-utils": ^0.30.0
+    "@metamask/rpc-methods": ^0.31.0
+    "@metamask/snaps-execution-environments": ^0.31.0
+    "@metamask/snaps-registry": ^1.1.1
+    "@metamask/snaps-utils": ^0.31.0
     "@metamask/subject-metadata-controller": ^2.0.0
-    "@metamask/utils": ^3.4.1
+    "@metamask/utils": ^5.0.0
     "@xstate/fsm": ^2.0.0
     concat-stream: ^2.0.0
     cron-parser: ^4.5.0
@@ -4356,61 +4356,61 @@ __metadata:
     pump: ^3.0.0
     readable-web-to-node-stream: ^3.0.2
     tar-stream: ^2.2.0
-  checksum: 022f875037fd058c237b8cba80e47a5ef222d379a073af4a35242e15c8c83ac902050ab8ae51a80536254b4ccb7e73b854c49b3ff5fac51154071da46d879e20
+  checksum: 6e3a69216a3dbcdef7702caf60795bd7bc25169e491d695a14638c0ce67dcfc67e509f8f29604d974d23cc132edf933e16d2859d4502455e805a2ffd9a366d12
   languageName: node
   linkType: hard
 
-"@metamask/snaps-execution-environments@npm:^0.30.0":
-  version: 0.30.0
-  resolution: "@metamask/snaps-execution-environments@npm:0.30.0"
+"@metamask/snaps-execution-environments@npm:^0.31.0":
+  version: 0.31.0
+  resolution: "@metamask/snaps-execution-environments@npm:0.31.0"
   dependencies:
     "@metamask/object-multiplex": ^1.2.0
     "@metamask/post-message-stream": ^6.1.0
     "@metamask/providers": ^10.2.0
-    "@metamask/rpc-methods": ^0.30.0
-    "@metamask/snaps-utils": ^0.30.0
-    "@metamask/utils": ^3.4.1
+    "@metamask/rpc-methods": ^0.31.0
+    "@metamask/snaps-utils": ^0.31.0
+    "@metamask/utils": ^5.0.0
     eth-rpc-errors: ^4.0.3
     json-rpc-engine: ^6.1.0
     pump: ^3.0.0
     ses: ^0.18.1
     stream-browserify: ^3.0.0
     superstruct: ^1.0.3
-  checksum: ee81caec7bf77703510983f62f3f2cf94753b624ba14691ff80ca30efab9a07ca329b278cd08323c72bcb3aeef7e78d089af4d35d14a469afc4f7bb8bc7e5fa7
+  checksum: 114b8370980868e3a8db650a9cac35a31f063d82621bbc7e052157a54ee96b60c26db260bcac904813b751fec103da5fe74af061d0c7dd3fb6c50dd975258350
   languageName: node
   linkType: hard
 
-"@metamask/snaps-registry@npm:^1.0.0, @metamask/snaps-registry@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@metamask/snaps-registry@npm:1.1.0"
+"@metamask/snaps-registry@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "@metamask/snaps-registry@npm:1.1.1"
   dependencies:
-    "@metamask/utils": ^3.4.0
+    "@metamask/utils": ^5.0.0
     superstruct: ^1.0.3
-  checksum: a67a9e7a30a2f7bc55d130b278573aa2bf043ab5c5935704ab8166898dadf37557284412f9b653f9ed52059a557a51b8472aabbe6887a06922d5526ead12199b
+  checksum: 1e77c30af2955baf559160c1098f79a042196b23cd691448668672b4c8c3d92a0602061ab4c4f05b2f60310cfd81147c5e87ce80da6d4a48e45765d569132a77
   languageName: node
   linkType: hard
 
-"@metamask/snaps-ui@npm:^0.30.0":
-  version: 0.30.0
-  resolution: "@metamask/snaps-ui@npm:0.30.0"
+"@metamask/snaps-ui@npm:^0.31.0":
+  version: 0.31.0
+  resolution: "@metamask/snaps-ui@npm:0.31.0"
   dependencies:
-    "@metamask/utils": ^3.4.1
+    "@metamask/utils": ^5.0.0
     superstruct: ^1.0.3
-  checksum: a4612e08e830542b094bf995023221a24dfa45861d3ca919c1c11ae1bd3d6933789d40c667780145bcd3ff3053d0593e654ae1812ea9f3c7cc973d500cfb0a96
+  checksum: b4d7df0e3f3bd28c8cb958c72143d442c44f0ca4f02e226725b804e9f24c1d9a0f7d1d46818adb2969651d4a4626b57a80e669c9867f0dc3335fd85cf458c9a3
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^0.30.0":
-  version: 0.30.0
-  resolution: "@metamask/snaps-utils@npm:0.30.0"
+"@metamask/snaps-utils@npm:^0.31.0":
+  version: 0.31.0
+  resolution: "@metamask/snaps-utils@npm:0.31.0"
   dependencies:
     "@babel/core": ^7.18.6
     "@babel/types": ^7.18.7
     "@metamask/permission-controller": ^3.0.0
     "@metamask/providers": ^10.2.1
-    "@metamask/snaps-registry": ^1.0.0
-    "@metamask/snaps-ui": ^0.30.0
-    "@metamask/utils": ^3.4.1
+    "@metamask/snaps-registry": ^1.1.1
+    "@metamask/snaps-ui": ^0.31.0
+    "@metamask/utils": ^5.0.0
     "@noble/hashes": ^1.1.3
     "@scure/base": ^1.1.1
     cron-parser: ^4.5.0
@@ -4422,7 +4422,7 @@ __metadata:
     ses: ^0.18.1
     superstruct: ^1.0.3
     validate-npm-package-name: ^5.0.0
-  checksum: 56334795dee7deeddd63badd35870ebb51ba5336071146bd6f48a9f7c1d703515241ac9371d7a4e054d77d7c6d06f34530e7b9439074339a46fea89920d32bce
+  checksum: 007dc6e08989b0a197cc84d95b29a194c3408a2f9e822a42c2060a1c842ff10c737cf8f5f0e8f8178a7ea7f98565cfc8e16eaa9181331b50b5dc13c3a80655cd
   languageName: node
   linkType: hard
 
@@ -4464,7 +4464,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.3.0, @metamask/utils@npm:^3.3.1, @metamask/utils@npm:^3.4.0, @metamask/utils@npm:^3.4.1":
+"@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.3.0, @metamask/utils@npm:^3.3.1, @metamask/utils@npm:^3.4.1":
   version: 3.6.0
   resolution: "@metamask/utils@npm:3.6.0"
   dependencies:
@@ -24280,7 +24280,7 @@ __metadata:
     "@metamask/forwarder": ^1.1.0
     "@metamask/gas-fee-controller": ^1.0.0
     "@metamask/jazzicon": ^2.0.0
-    "@metamask/key-tree": ^6.2.1
+    "@metamask/key-tree": ^7.0.0
     "@metamask/logo": ^3.1.1
     "@metamask/metamask-eth-abis": ^3.0.0
     "@metamask/notification-controller": ^1.0.0
@@ -24291,13 +24291,13 @@ __metadata:
     "@metamask/post-message-stream": ^6.0.0
     "@metamask/providers": ^10.2.1
     "@metamask/rate-limit-controller": ^1.0.0
-    "@metamask/rpc-methods": ^0.30.0
+    "@metamask/rpc-methods": ^0.31.0
     "@metamask/scure-bip39": ^2.0.3
     "@metamask/slip44": ^2.1.0
     "@metamask/smart-transactions-controller": ^3.1.0
-    "@metamask/snaps-controllers": ^0.30.0
-    "@metamask/snaps-ui": ^0.30.0
-    "@metamask/snaps-utils": ^0.30.0
+    "@metamask/snaps-controllers": ^0.31.0
+    "@metamask/snaps-ui": ^0.31.0
+    "@metamask/snaps-utils": ^0.31.0
     "@metamask/subject-metadata-controller": ^1.0.0
     "@metamask/test-dapp": ^5.6.0
     "@metamask/utils": ^5.0.0

From c21c2bdcf0c757b71a179a37bbcd7b87cf19b5dd Mon Sep 17 00:00:00 2001
From: legobeat <109787230+legobeat@users.noreply.github.com>
Date: Fri, 17 Mar 2023 23:29:39 +0900
Subject: [PATCH 020/129] security: patch request for CVE-2023-28155 (#18208)

* security: patch request for CVE-2023-28155

GHSA-p8p7-x288-28g6

Ported from https://github.com/request/request/pull/3444

* add iyarc exclusion
---
 .iyarc                                        |  4 +++
 .../request-npm-2.88.2-f4a57c72c4.patch       | 31 +++++++++++++++++++
 package.json                                  |  5 ++-
 yarn.lock                                     | 30 +++++++++++++++++-
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 .yarn/patches/request-npm-2.88.2-f4a57c72c4.patch

diff --git a/.iyarc b/.iyarc
index 3fa8de8b3..79536d383 100644
--- a/.iyarc
+++ b/.iyarc
@@ -15,3 +15,7 @@ GHSA-6fc8-4gx4-v693
 # patched version of 3.3.1. We can remove this once the
 # smart-transaction-controller updates its dependency.
 GHSA-8gh8-hqwg-xf34
+
+# request library is subject to SSRF.
+# addressed by temporary patch in .yarn/patches/request-npm-2.88.2-f4a57c72c4.patch
+GHSA-p8p7-x288-28g6
diff --git a/.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch b/.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch
new file mode 100644
index 000000000..c879c340c
--- /dev/null
+++ b/.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch
@@ -0,0 +1,31 @@
+diff --git a/lib/redirect.js b/lib/redirect.js
+index b9150e77c73d63367845c0aec15b5684d900943f..2864f9f2abc481ecf2b2dd96b1293f5b93393efd 100644
+--- a/lib/redirect.js
++++ b/lib/redirect.js
+@@ -14,6 +14,7 @@ function Redirect (request) {
+   this.redirects = []
+   this.redirectsFollowed = 0
+   this.removeRefererHeader = false
++  this.allowInsecureRedirect = false
+ }
+ 
+ Redirect.prototype.onRequest = function (options) {
+@@ -40,6 +41,9 @@ Redirect.prototype.onRequest = function (options) {
+   if (options.followOriginalHttpMethod !== undefined) {
+     self.followOriginalHttpMethod = options.followOriginalHttpMethod
+   }
++  if (options.allowInsecureRedirect !== undefined) {
++    self.allowInsecureRedirect = options.allowInsecureRedirect
++  }
+ }
+ 
+ Redirect.prototype.redirectTo = function (response) {
+@@ -108,7 +112,7 @@ Redirect.prototype.onResponse = function (response) {
+   request.uri = url.parse(redirectTo)
+ 
+   // handle the case where we change protocol from https to http or vice versa
+-  if (request.uri.protocol !== uriPrev.protocol) {
++  if (request.uri.protocol !== uriPrev.protocol && self.allowInsecureRedirect) {
+     delete request.agent
+   }
+ 
diff --git a/package.json b/package.json
index cffda1384..d57328cb5 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,10 @@
     "async-done@~1.3.2": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
     "async-done@^1.2.0": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
     "async-done@^1.2.2": "patch:async-done@npm%3A1.3.2#./.yarn/patches/async-done-npm-1.3.2-1f0a4a8997.patch",
-    "fast-json-patch@^3.1.1": "patch:fast-json-patch@npm%3A3.1.1#./.yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch"
+    "fast-json-patch@^3.1.1": "patch:fast-json-patch@npm%3A3.1.1#./.yarn/patches/fast-json-patch-npm-3.1.1-7e8bb70a45.patch",
+    "request@^2.83.0": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch",
+    "request@^2.88.2": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch",
+    "request@^2.85.0": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch"
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
diff --git a/yarn.lock b/yarn.lock
index a23a32235..11acd8dea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -29800,7 +29800,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"request@npm:^2.83.0, request@npm:^2.85.0, request@npm:^2.88.2":
+"request@npm:2.88.2":
   version: 2.88.2
   resolution: "request@npm:2.88.2"
   dependencies:
@@ -29828,6 +29828,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"request@patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch::locator=metamask-crx%40workspace%3A.":
+  version: 2.88.2
+  resolution: "request@patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch::version=2.88.2&hash=2aadd7&locator=metamask-crx%40workspace%3A."
+  dependencies:
+    aws-sign2: ~0.7.0
+    aws4: ^1.8.0
+    caseless: ~0.12.0
+    combined-stream: ~1.0.6
+    extend: ~3.0.2
+    forever-agent: ~0.6.1
+    form-data: ~2.3.2
+    har-validator: ~5.1.3
+    http-signature: ~1.2.0
+    is-typedarray: ~1.0.0
+    isstream: ~0.1.2
+    json-stringify-safe: ~5.0.1
+    mime-types: ~2.1.19
+    oauth-sign: ~0.9.0
+    performance-now: ^2.1.0
+    qs: ~6.5.2
+    safe-buffer: ^5.1.2
+    tough-cookie: ~2.5.0
+    tunnel-agent: ^0.6.0
+    uuid: ^3.3.2
+  checksum: 1a64d706b36b2bdd5803c3a0fd3fee5e76e8c17d01c34f84972460fbfa5914302c300821a1fafce804d236e637f3745f3bdfbbb4219c139e112076790fc279af
+  languageName: node
+  linkType: hard
+
 "require-directory@npm:^2.1.1":
   version: 2.1.1
   resolution: "require-directory@npm:2.1.1"

From 3117890b305ffae45251264b30a8d77c32d888be Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Fri, 17 Mar 2023 10:06:59 -0700
Subject: [PATCH 021/129] AvatarBase font-size logic  (#18203)

* Updating AvatarBase to use Text component instead of Box and adding font size logic based on avatar size

* Updating snaps
---
 .../__snapshots__/avatar-account.test.js.snap |   2 +-
 .../component-library/avatar-base/README.mdx  |   2 +
 .../__snapshots__/avatar-base.test.js.snap    |   2 +-
 .../avatar-base/avatar-base.js                |  56 +++--
 .../avatar-base/avatar-base.scss              |   5 -
 .../avatar-base/avatar-base.stories.js        |   3 +-
 .../avatar-base/avatar-base.test.js           |  32 +--
 .../__snapshots__/avatar-favicon.test.js.snap |   2 +-
 .../__snapshots__/avatar-icon.test.js.snap    |   2 +-
 .../avatar-icon/avatar-icon.test.js           |   4 +-
 .../avatar-network/README.mdx                 |   4 +
 .../__snapshots__/avatar-network.test.js.snap |   2 +-
 .../avatar-network/avatar-network.stories.js  |  30 ++-
 .../avatar-network/avatar-network.test.js     |   4 +-
 .../component-library/avatar-token/README.mdx |   4 +
 .../__snapshots__/avatar-token.test.js.snap   |   2 +-
 .../avatar-token/avatar-token.stories.js      | 228 +++++++++++++++++-
 .../avatar-token/avatar-token.test.js         |   4 +-
 .../__snapshots__/picker-network.test.js.snap |   2 +-
 .../__snapshots__/tag-url.test.js.snap        |   2 +-
 20 files changed, 326 insertions(+), 66 deletions(-)

diff --git a/ui/components/component-library/avatar-account/__snapshots__/avatar-account.test.js.snap b/ui/components/component-library/avatar-account/__snapshots__/avatar-account.test.js.snap
index 4fb7ecbbe..0dfe9536f 100644
--- a/ui/components/component-library/avatar-account/__snapshots__/avatar-account.test.js.snap
+++ b/ui/components/component-library/avatar-account/__snapshots__/avatar-account.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarAccount should render correctly 1`] = `
 <div>
   <div
-    class="box mm-avatar-base mm-avatar-base--size-md mm-avatar-account box--flex-direction-row box--color-text-default box--background-color-background-alternative box--border-color-border-default box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
     data-testid="avatar-account"
   >
     <div
diff --git a/ui/components/component-library/avatar-base/README.mdx b/ui/components/component-library/avatar-base/README.mdx
index 77d5055d5..ff0e396f6 100644
--- a/ui/components/component-library/avatar-base/README.mdx
+++ b/ui/components/component-library/avatar-base/README.mdx
@@ -32,6 +32,8 @@ Possible sizes include:
 
 Defaults to `md`
 
+The text styles of the `AvatarBase` is based on the `size` prop. To override this use the `Text` component's `variant` prop. `AvatarBase` also accepts all `Text` component props.
+
 <Canvas>
   <Story id="components-componentlibrary-avatarbase--size" />
 </Canvas>
diff --git a/ui/components/component-library/avatar-base/__snapshots__/avatar-base.test.js.snap b/ui/components/component-library/avatar-base/__snapshots__/avatar-base.test.js.snap
index 004fa7ead..91206391f 100644
--- a/ui/components/component-library/avatar-base/__snapshots__/avatar-base.test.js.snap
+++ b/ui/components/component-library/avatar-base/__snapshots__/avatar-base.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarBase should render correctly 1`] = `
 <div>
   <div
-    class="box mm-avatar-base mm-avatar-base--size-md box--flex-direction-row box--color-text-default box--background-color-background-alternative box--border-color-border-default box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
     data-testid="avatar-base"
   />
 </div>
diff --git a/ui/components/component-library/avatar-base/avatar-base.js b/ui/components/component-library/avatar-base/avatar-base.js
index 8b6da1f0e..22a1e9553 100644
--- a/ui/components/component-library/avatar-base/avatar-base.js
+++ b/ui/components/component-library/avatar-base/avatar-base.js
@@ -2,12 +2,20 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
-import Box from '../../ui/box/box';
 import {
   BackgroundColor,
   BorderColor,
   TextColor,
+  DISPLAY,
+  JustifyContent,
+  AlignItems,
+  BorderRadius,
+  TextVariant,
+  TEXT_TRANSFORM,
 } from '../../../helpers/constants/design-system';
+
+import { Text } from '../text';
+
 import { AVATAR_BASE_SIZES } from './avatar-base.constants';
 
 export const AvatarBase = ({
@@ -18,19 +26,36 @@ export const AvatarBase = ({
   color = TextColor.textDefault,
   className,
   ...props
-}) => (
-  <Box
-    className={classnames(
-      'mm-avatar-base',
-      `mm-avatar-base--size-${size}`,
-      className,
-    )}
-    {...{ backgroundColor, borderColor, color, ...props }}
-  >
-    {children}
-  </Box>
-);
+}) => {
+  let fallbackTextVariant;
 
+  if (size === AVATAR_BASE_SIZES.LG || size === AVATAR_BASE_SIZES.XL) {
+    fallbackTextVariant = TextVariant.bodyLgMedium;
+  } else if (size === AVATAR_BASE_SIZES.SM || size === AVATAR_BASE_SIZES.MD) {
+    fallbackTextVariant = TextVariant.bodySm;
+  } else {
+    fallbackTextVariant = TextVariant.bodyXs;
+  }
+  return (
+    <Text
+      className={classnames(
+        'mm-avatar-base',
+        `mm-avatar-base--size-${size}`,
+        className,
+      )}
+      as="div"
+      display={DISPLAY.FLEX}
+      justifyContent={JustifyContent.center}
+      alignItems={AlignItems.center}
+      borderRadius={BorderRadius.full}
+      variant={fallbackTextVariant}
+      textTransform={TEXT_TRANSFORM.UPPERCASE}
+      {...{ backgroundColor, borderColor, color, ...props }}
+    >
+      {children}
+    </Text>
+  );
+};
 AvatarBase.propTypes = {
   /**
    * The size of the AvatarBase.
@@ -62,8 +87,7 @@ AvatarBase.propTypes = {
    */
   className: PropTypes.string,
   /**
-   * AvatarBase also accepts all Box props including but not limited to
-   * className, as(change root element of HTML element) and margin props
+   * AvatarBase also accepts all Text props including variant and all Box props
    */
-  ...Box.propTypes,
+  ...Text.propTypes,
 };
diff --git a/ui/components/component-library/avatar-base/avatar-base.scss b/ui/components/component-library/avatar-base/avatar-base.scss
index 257a897c7..28a094e01 100644
--- a/ui/components/component-library/avatar-base/avatar-base.scss
+++ b/ui/components/component-library/avatar-base/avatar-base.scss
@@ -25,10 +25,5 @@
   width: var(--avatar-size);
   max-width: var(--avatar-size);
   flex: 0 0 var(--avatar-size);
-  border-radius: 100%;
   overflow: hidden;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  text-transform: uppercase;
 }
diff --git a/ui/components/component-library/avatar-base/avatar-base.stories.js b/ui/components/component-library/avatar-base/avatar-base.stories.js
index a2bfd45ba..9515ca09f 100644
--- a/ui/components/component-library/avatar-base/avatar-base.stories.js
+++ b/ui/components/component-library/avatar-base/avatar-base.stories.js
@@ -89,10 +89,11 @@ export default {
     color: TextColor.textDefault,
     backgroundColor: BackgroundColor.backgroundAlternative,
     borderColor: BorderColor.borderDefault,
+    children: 'B',
   },
 };
 
-export const DefaultStory = (args) => <AvatarBase {...args}>B</AvatarBase>;
+export const DefaultStory = (args) => <AvatarBase {...args} />;
 
 DefaultStory.storyName = 'Default';
 
diff --git a/ui/components/component-library/avatar-base/avatar-base.test.js b/ui/components/component-library/avatar-base/avatar-base.test.js
index 9137f3a75..cf0058dc9 100644
--- a/ui/components/component-library/avatar-base/avatar-base.test.js
+++ b/ui/components/component-library/avatar-base/avatar-base.test.js
@@ -2,7 +2,7 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { Color } from '../../../helpers/constants/design-system';
+import { Color, TextColor } from '../../../helpers/constants/design-system';
 
 import { AvatarBase } from './avatar-base';
 
@@ -25,19 +25,19 @@ describe('AvatarBase', () => {
       </>,
     );
     expect(getByTestId('avatar-base-xs')).toHaveClass(
-      'mm-avatar-base--size-xs',
+      'mm-avatar-base--size-xs mm-text--body-xs',
     );
     expect(getByTestId('avatar-base-sm')).toHaveClass(
-      'mm-avatar-base--size-sm',
+      'mm-avatar-base--size-sm  mm-text--body-sm',
     );
     expect(getByTestId('avatar-base-md')).toHaveClass(
-      'mm-avatar-base--size-md',
+      'mm-avatar-base--size-md  mm-text--body-sm',
     );
     expect(getByTestId('avatar-base-lg')).toHaveClass(
-      'mm-avatar-base--size-lg',
+      'mm-avatar-base--size-lg mm-text--body-lg-medium',
     );
     expect(getByTestId('avatar-base-xl')).toHaveClass(
-      'mm-avatar-base--size-xl',
+      'mm-avatar-base--size-xl mm-text--body-lg-medium',
     );
   });
   // className
@@ -63,20 +63,20 @@ describe('AvatarBase', () => {
     const { getByTestId } = render(
       <>
         <AvatarBase
-          color={Color.successDefault}
-          data-testid={Color.successDefault}
+          color={TextColor.successDefault}
+          data-testid={TextColor.successDefault}
         />
         <AvatarBase
-          color={Color.errorDefault}
-          data-testid={Color.errorDefault}
+          color={TextColor.errorDefault}
+          data-testid={TextColor.errorDefault}
         />
       </>,
     );
-    expect(getByTestId(Color.successDefault)).toHaveClass(
-      `box--color-${Color.successDefault}`,
+    expect(getByTestId(TextColor.successDefault)).toHaveClass(
+      `mm-text--color-${TextColor.successDefault}`,
     );
-    expect(getByTestId(Color.errorDefault)).toHaveClass(
-      `box--color-${Color.errorDefault}`,
+    expect(getByTestId(TextColor.errorDefault)).toHaveClass(
+      `mm-text--color-${TextColor.errorDefault}`,
     );
   });
   // background color
@@ -84,11 +84,11 @@ describe('AvatarBase', () => {
     const { getByTestId } = render(
       <>
         <AvatarBase
-          backgroundColor={Color.successDefault}
+          backgroundColor={TextColor.successDefault}
           data-testid={Color.successDefault}
         />
         <AvatarBase
-          backgroundColor={Color.errorDefault}
+          backgroundColor={TextColor.errorDefault}
           data-testid={Color.errorDefault}
         />
       </>,
diff --git a/ui/components/component-library/avatar-favicon/__snapshots__/avatar-favicon.test.js.snap b/ui/components/component-library/avatar-favicon/__snapshots__/avatar-favicon.test.js.snap
index e6f2c07c4..f1c969961 100644
--- a/ui/components/component-library/avatar-favicon/__snapshots__/avatar-favicon.test.js.snap
+++ b/ui/components/component-library/avatar-favicon/__snapshots__/avatar-favicon.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarFavicon should render correctly 1`] = `
 <div>
   <div
-    class="box mm-avatar-base mm-avatar-base--size-md mm-avatar-favicon box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--border-color-transparent box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-favicon mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     data-testid="avatar-favicon"
   >
     <span
diff --git a/ui/components/component-library/avatar-icon/__snapshots__/avatar-icon.test.js.snap b/ui/components/component-library/avatar-icon/__snapshots__/avatar-icon.test.js.snap
index 22f56354f..a97d4408e 100644
--- a/ui/components/component-library/avatar-icon/__snapshots__/avatar-icon.test.js.snap
+++ b/ui/components/component-library/avatar-icon/__snapshots__/avatar-icon.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarIcon should render correctly 1`] = `
 <div>
   <div
-    class="box mm-avatar-base mm-avatar-base--size-md mm-avatar-icon box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-primary-muted box--border-color-transparent box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-icon mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-primary-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-muted box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     data-testid="avatar-icon"
   >
     <span
diff --git a/ui/components/component-library/avatar-icon/avatar-icon.test.js b/ui/components/component-library/avatar-icon/avatar-icon.test.js
index 73d7fbbcc..65f8eee21 100644
--- a/ui/components/component-library/avatar-icon/avatar-icon.test.js
+++ b/ui/components/component-library/avatar-icon/avatar-icon.test.js
@@ -100,7 +100,9 @@ describe('AvatarIcon', () => {
       />,
     );
 
-    expect(getByTestId('success')).toHaveClass('box--color-success-default');
+    expect(getByTestId('success')).toHaveClass(
+      'mm-text--color-success-default',
+    );
     expect(getByTestId('success')).toHaveClass(
       'box--background-color-success-muted',
     );
diff --git a/ui/components/component-library/avatar-network/README.mdx b/ui/components/component-library/avatar-network/README.mdx
index 92ad2e0e9..81a32c49e 100644
--- a/ui/components/component-library/avatar-network/README.mdx
+++ b/ui/components/component-library/avatar-network/README.mdx
@@ -30,6 +30,8 @@ Possible sizes include:
 
 Defaults to `md`
 
+The fallback display of the `AvatarNetwork` is a circle with the initial letter of the network name. The size of the initial letter is calculated based on the size of the `AvatarNetwork` component.
+
 <Canvas>
   <Story id="components-componentlibrary-avatarnetwork--size-story" />
 </Canvas>
@@ -48,6 +50,8 @@ import { AvatarNetwork } from '../../component-library';
 
 Use the `name` prop to set the initial letter of the `AvatarNetwork`. This will be used as the fallback display if no image url is passed to the `src` prop.
 
+Use `Text` component props to change the `variant`, `font-weight`, `font-family`, etc.
+
 <Canvas>
   <Story id="components-componentlibrary-avatarnetwork--name" />
 </Canvas>
diff --git a/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.js.snap b/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.js.snap
index 4ccac5bc5..60137e80c 100644
--- a/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.js.snap
+++ b/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarNetwork should render correctly 1`] = `
 <div>
   <div
-    class="box mm-avatar-base mm-avatar-base--size-md mm-avatar-network box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--border-color-transparent box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     data-testid="avatar-network"
   >
     ?
diff --git a/ui/components/component-library/avatar-network/avatar-network.stories.js b/ui/components/component-library/avatar-network/avatar-network.stories.js
index 28ba38c7a..811864f69 100644
--- a/ui/components/component-library/avatar-network/avatar-network.stories.js
+++ b/ui/components/component-library/avatar-network/avatar-network.stories.js
@@ -12,12 +12,12 @@ import {
 import Box from '../../ui/box/box';
 
 import README from './README.mdx';
+
 import { AvatarNetwork } from './avatar-network';
 import { AVATAR_NETWORK_SIZES } from './avatar-network.constants';
 
 export default {
   title: 'Components/ComponentLibrary/AvatarNetwork',
-
   component: AvatarNetwork,
   parameters: {
     docs: {
@@ -67,13 +67,27 @@ export const DefaultStory = Template.bind({});
 DefaultStory.storyName = 'Default';
 
 export const SizeStory = (args) => (
-  <Box display={DISPLAY.FLEX} alignItems={AlignItems.baseline} gap={1}>
-    <AvatarNetwork {...args} size={Size.XS} />
-    <AvatarNetwork {...args} size={Size.SM} />
-    <AvatarNetwork {...args} size={Size.MD} />
-    <AvatarNetwork {...args} size={Size.LG} />
-    <AvatarNetwork {...args} size={Size.XL} />
-  </Box>
+  <>
+    <Box
+      display={DISPLAY.FLEX}
+      alignItems={AlignItems.flexEnd}
+      gap={1}
+      marginBottom={4}
+    >
+      <AvatarNetwork {...args} size={Size.XS} />
+      <AvatarNetwork {...args} size={Size.SM} />
+      <AvatarNetwork {...args} size={Size.MD} />
+      <AvatarNetwork {...args} size={Size.LG} />
+      <AvatarNetwork {...args} size={Size.XL} />
+    </Box>
+    <Box display={DISPLAY.FLEX} alignItems={AlignItems.flexEnd} gap={1}>
+      <AvatarNetwork {...args} src="" size={Size.XS} />
+      <AvatarNetwork {...args} src="" size={Size.SM} />
+      <AvatarNetwork {...args} src="" size={Size.MD} />
+      <AvatarNetwork {...args} src="" size={Size.LG} />
+      <AvatarNetwork {...args} src="" size={Size.XL} />
+    </Box>
+  </>
 );
 SizeStory.storyName = 'Size';
 
diff --git a/ui/components/component-library/avatar-network/avatar-network.test.js b/ui/components/component-library/avatar-network/avatar-network.test.js
index cded1d76a..6b2ee4f92 100644
--- a/ui/components/component-library/avatar-network/avatar-network.test.js
+++ b/ui/components/component-library/avatar-network/avatar-network.test.js
@@ -75,10 +75,10 @@ describe('AvatarNetwork', () => {
       </>,
     );
     expect(getByTestId(TextColor.successDefault)).toHaveClass(
-      `box--color-${TextColor.successDefault}`,
+      `mm-text--color-${TextColor.successDefault}`,
     );
     expect(getByTestId(TextColor.errorDefault)).toHaveClass(
-      `box--color-${TextColor.errorDefault}`,
+      `mm-text--color-${TextColor.errorDefault}`,
     );
   });
   // background color
diff --git a/ui/components/component-library/avatar-token/README.mdx b/ui/components/component-library/avatar-token/README.mdx
index 63e7e5b14..efe5375e9 100644
--- a/ui/components/component-library/avatar-token/README.mdx
+++ b/ui/components/component-library/avatar-token/README.mdx
@@ -30,6 +30,8 @@ Possible sizes include:
 
 Defaults to `md`
 
+The fallback display of the `AvatarToken` is a circle with the initial letter of the network name. The size of the initial letter is calculated based on the size of the `AvatarToken` component.
+
 <Canvas>
   <Story id="components-componentlibrary-avatartoken--size-story" />
 </Canvas>
@@ -48,6 +50,8 @@ import { AvatarToken } from '../../component-library';
 
 Use the `name` prop to set the initial letter of the `AvatarToken`. This will be used as the fallback display if no image url is passed to the `src` prop.
 
+Use `Text` component props to change the `variant`, `font-weight`, `font-family`, etc.
+
 <Canvas>
   <Story id="components-componentlibrary-avatartoken--name" />
 </Canvas>
diff --git a/ui/components/component-library/avatar-token/__snapshots__/avatar-token.test.js.snap b/ui/components/component-library/avatar-token/__snapshots__/avatar-token.test.js.snap
index 23dd22341..b67f6c466 100644
--- a/ui/components/component-library/avatar-token/__snapshots__/avatar-token.test.js.snap
+++ b/ui/components/component-library/avatar-token/__snapshots__/avatar-token.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarToken should render correctly 1`] = `
 <div>
   <div
-    class="box mm-avatar-base mm-avatar-base--size-md mm-avatar-token box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--border-color-transparent box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     data-testid="avatar-token"
   >
     <img
diff --git a/ui/components/component-library/avatar-token/avatar-token.stories.js b/ui/components/component-library/avatar-token/avatar-token.stories.js
index a40013831..e89756fdd 100644
--- a/ui/components/component-library/avatar-token/avatar-token.stories.js
+++ b/ui/components/component-library/avatar-token/avatar-token.stories.js
@@ -10,7 +10,16 @@ import {
 
 import Box from '../../ui/box/box';
 
+import {
+  AvatarNetwork,
+  BUTTON_LINK_SIZES,
+  BadgeWrapper,
+  ButtonLink,
+  Text,
+} from '..';
+
 import README from './README.mdx';
+
 import { AvatarToken } from './avatar-token';
 import { AVATAR_TOKEN_SIZES } from './avatar-token.constants';
 
@@ -66,13 +75,218 @@ export const DefaultStory = Template.bind({});
 DefaultStory.storyName = 'Default';
 
 export const SizeStory = (args) => (
-  <Box display={DISPLAY.FLEX} alignItems={AlignItems.baseline} gap={1}>
-    <AvatarToken {...args} size={Size.XS} />
-    <AvatarToken {...args} size={Size.SM} />
-    <AvatarToken {...args} size={Size.MD} />
-    <AvatarToken {...args} size={Size.LG} />
-    <AvatarToken {...args} size={Size.XL} />
-  </Box>
+  <>
+    <Box
+      display={DISPLAY.FLEX}
+      alignItems={AlignItems.baseline}
+      gap={2}
+      marginBottom={4}
+    >
+      <AvatarToken {...args} size={Size.XS} />
+      <AvatarToken {...args} size={Size.SM} />
+      <AvatarToken {...args} size={Size.MD} />
+      <AvatarToken {...args} size={Size.LG} />
+      <AvatarToken {...args} size={Size.XL} />
+    </Box>
+    <Box
+      display={DISPLAY.FLEX}
+      alignItems={AlignItems.flexEnd}
+      gap={2}
+      marginBottom={4}
+    >
+      <AvatarToken {...args} src="" size={Size.XS} />
+      <AvatarToken {...args} src="" size={Size.SM} />
+      <AvatarToken {...args} src="" size={Size.MD} />
+      <AvatarToken {...args} src="" size={Size.LG} />
+      <AvatarToken {...args} src="" size={Size.XL} />
+    </Box>
+    <Text marginBottom={4}>
+      Sizes with{' '}
+      <ButtonLink
+        size={BUTTON_LINK_SIZES.INHERIT}
+        href="/docs/components-componentlibrary-buttonlink--default-story"
+      >
+        AvatarNetwork
+      </ButtonLink>{' '}
+      and{' '}
+      <ButtonLink
+        size={BUTTON_LINK_SIZES.INHERIT}
+        href="/docs/components-componentlibrary-badgewrapper--default-story"
+      >
+        BadgeWrapper
+      </ButtonLink>{' '}
+      components
+    </Text>
+    <Box
+      display={DISPLAY.FLEX}
+      alignItems={AlignItems.flexEnd}
+      gap={2}
+      marginBottom={4}
+    >
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            src="./images/eth_logo.svg"
+            name="ETH"
+            size={Size.XS}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken {...args} name="ETH" size={Size.XS} />
+      </BadgeWrapper>
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            src="./images/eth_logo.svg"
+            name="ETH"
+            size={Size.XS}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken {...args} name="ETH" size={Size.SM} />
+      </BadgeWrapper>
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            src="./images/eth_logo.svg"
+            name="ETH"
+            size={Size.XS}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken {...args} name="ETH" size={Size.MD} />
+      </BadgeWrapper>
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            src="./images/eth_logo.svg"
+            name="ETH"
+            size={Size.XS}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken {...args} name="ETH" size={Size.LG} />
+      </BadgeWrapper>
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            src="./images/eth_logo.svg"
+            name="ETH"
+            size={Size.SM}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken {...args} name="ETH" size={Size.XL} />
+      </BadgeWrapper>
+    </Box>
+    <Box display={DISPLAY.FLEX} alignItems={AlignItems.flexEnd} gap={2}>
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            name="ETH"
+            size={Size.XS}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken
+          {...args}
+          src=""
+          name="ETH"
+          size={Size.XS}
+          borderColor={BorderColor.borderDefault}
+          borderSize={2}
+        />
+      </BadgeWrapper>
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            name="ETH"
+            size={Size.XS}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken
+          {...args}
+          name="ETH"
+          src=""
+          size={Size.SM}
+          borderColor={BorderColor.borderDefault}
+          borderSize={2}
+        />
+      </BadgeWrapper>
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            name="ETH"
+            size={Size.XS}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken
+          {...args}
+          name="ETH"
+          src=""
+          size={Size.MD}
+          borderColor={BorderColor.borderDefault}
+          borderSize={2}
+        />
+      </BadgeWrapper>
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            name="ETH"
+            size={Size.XS}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken
+          {...args}
+          name="ETH"
+          src=""
+          size={Size.LG}
+          borderColor={BorderColor.borderDefault}
+          borderSize={2}
+        />
+      </BadgeWrapper>
+      <BadgeWrapper
+        badge={
+          <AvatarNetwork
+            name="ETH"
+            size={Size.SM}
+            borderColor={BackgroundColor.backgroundDefault}
+            borderWidth={2}
+          />
+        }
+      >
+        <AvatarToken
+          {...args}
+          name="ETH"
+          src=""
+          size={Size.XL}
+          borderColor={BorderColor.borderDefault}
+          borderSize={2}
+        />
+      </BadgeWrapper>
+    </Box>
+  </>
 );
 SizeStory.storyName = 'Size';
 
diff --git a/ui/components/component-library/avatar-token/avatar-token.test.js b/ui/components/component-library/avatar-token/avatar-token.test.js
index 3a711782d..53d8e8d87 100644
--- a/ui/components/component-library/avatar-token/avatar-token.test.js
+++ b/ui/components/component-library/avatar-token/avatar-token.test.js
@@ -73,10 +73,10 @@ describe('AvatarToken', () => {
       </>,
     );
     expect(getByTestId(TextColor.successDefault)).toHaveClass(
-      `box--color-${TextColor.successDefault}`,
+      `mm-text--color-${TextColor.successDefault}`,
     );
     expect(getByTestId(TextColor.errorDefault)).toHaveClass(
-      `box--color-${TextColor.errorDefault}`,
+      `mm-text--color-${TextColor.errorDefault}`,
     );
   });
   // background color
diff --git a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.js.snap b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.js.snap
index 25a318cad..bf7783940 100644
--- a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.js.snap
+++ b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.js.snap
@@ -7,7 +7,7 @@ exports[`PickerNetwork should render the label inside the PickerNetwork 1`] = `
     data-testid="picker-network"
   >
     <div
-      class="box mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--border-color-transparent box--border-style-solid box--border-width-1"
+      class="box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     >
       I
     </div>
diff --git a/ui/components/component-library/tag-url/__snapshots__/tag-url.test.js.snap b/ui/components/component-library/tag-url/__snapshots__/tag-url.test.js.snap
index 3eea81879..4169c58f3 100644
--- a/ui/components/component-library/tag-url/__snapshots__/tag-url.test.js.snap
+++ b/ui/components/component-library/tag-url/__snapshots__/tag-url.test.js.snap
@@ -7,7 +7,7 @@ exports[`TagUrl should render the label inside the TagUrl 1`] = `
     data-testid="tag-url"
   >
     <div
-      class="box mm-avatar-base mm-avatar-base--size-md mm-avatar-favicon box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--border-color-transparent box--border-style-solid box--border-width-1"
+      class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-favicon mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     >
       <span
         class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-icon-default"

From 2a562087f93f255c69ba8fa6fd240e67becff9db Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Fri, 17 Mar 2023 10:24:07 -0700
Subject: [PATCH 022/129] Updating label according to insight report (#18151)

---
 .../form-text-field/README.mdx                |  4 ++--
 .../form-text-field/form-text-field.js        |  1 -
 .../form-text-field.stories.js                |  4 +---
 .../form-text-field/form-text-field.test.js   | 11 ---------
 .../component-library/label/README.mdx        | 23 ++++---------------
 .../component-library/label/label.js          | 17 +-------------
 .../component-library/label/label.stories.js  |  8 -------
 .../component-library/label/label.test.js     |  5 ----
 8 files changed, 8 insertions(+), 65 deletions(-)

diff --git a/ui/components/component-library/form-text-field/README.mdx b/ui/components/component-library/form-text-field/README.mdx
index 83cc9b4cd..e5a229941 100644
--- a/ui/components/component-library/form-text-field/README.mdx
+++ b/ui/components/component-library/form-text-field/README.mdx
@@ -290,7 +290,7 @@ import {
       * or require adding some form of customization
       * import the Label component separately
       */}
-    <Label htmlFor="custom-spending-cap" required>
+    <Label htmlFor="custom-spending-cap">
       Custom spending cap
     </Label>
     <Icon
@@ -326,7 +326,7 @@ import {
     * import the HelpText component separately and handle the error
     * logic yourself
     */}
-  <HelpText htmlFor="chainId" required marginRight={2}>
+  <HelpText htmlFor="chainId" marginRight={2}>
     Only enter a number that you're comfortable with the contract accessing
     now or in the future. You can always increase the token limit later.
   </HelpText>
diff --git a/ui/components/component-library/form-text-field/form-text-field.js b/ui/components/component-library/form-text-field/form-text-field.js
index 5ebc0016a..5659dffc2 100644
--- a/ui/components/component-library/form-text-field/form-text-field.js
+++ b/ui/components/component-library/form-text-field/form-text-field.js
@@ -59,7 +59,6 @@ export const FormTextField = ({
     {label && (
       <Label
         htmlFor={id}
-        required={required}
         {...labelProps}
         className={classnames(
           'mm-form-text-field__label',
diff --git a/ui/components/component-library/form-text-field/form-text-field.stories.js b/ui/components/component-library/form-text-field/form-text-field.stories.js
index 4c2ddd69c..a18b1f1e7 100644
--- a/ui/components/component-library/form-text-field/form-text-field.stories.js
+++ b/ui/components/component-library/form-text-field/form-text-field.stories.js
@@ -405,9 +405,7 @@ export const CustomLabelOrHelpText = () => (
         {/* If you need a custom label
         or require adding some form of customization
         import the Label component separately */}
-        <Label htmlFor="custom-spending-cap" required>
-          Custom spending cap
-        </Label>
+        <Label htmlFor="custom-spending-cap">Custom spending cap</Label>
         <Icon
           name={ICON_NAMES.INFO}
           size={Size.SM}
diff --git a/ui/components/component-library/form-text-field/form-text-field.test.js b/ui/components/component-library/form-text-field/form-text-field.test.js
index 3857409d2..5cce40982 100644
--- a/ui/components/component-library/form-text-field/form-text-field.test.js
+++ b/ui/components/component-library/form-text-field/form-text-field.test.js
@@ -234,17 +234,6 @@ describe('FormTextField', () => {
     expect(getByRole('textbox')).toHaveValue('test value');
     expect(getByRole('textbox')).toHaveAttribute('readonly', '');
   });
-  // required
-  it('should render with required asterisk after Label', () => {
-    const { getByTestId } = render(
-      <FormTextField
-        required
-        label="test label"
-        labelProps={{ 'data-testid': 'label-test-id' }}
-      />,
-    );
-    expect(getByTestId('label-test-id')).toHaveTextContent('test label*');
-  });
   // size = SIZES.MD
   it('should render with different size classes', () => {
     const { getByTestId } = render(
diff --git a/ui/components/component-library/label/README.mdx b/ui/components/component-library/label/README.mdx
index 92a84a28a..1d1ca3259 100644
--- a/ui/components/component-library/label/README.mdx
+++ b/ui/components/component-library/label/README.mdx
@@ -6,7 +6,7 @@ import { Label } from './label';
 
 # Label
 
-The `Label` is a component used to label form inputs
+`Label` is used to describe the purpose of a form field
 
 <Canvas>
   <Story id="components-componentlibrary-label--default-story" />
@@ -68,22 +68,7 @@ import { Label, TextField } from '../../component-library';
 <TextField id="add-network" placeholder="Enter network name" />
 ```
 
-### Required
+### Internal Resources
 
-Use the `required` prop to add a required red asterisk next to the `children` of the `Label`. Note the required asterisk will always render after the `children`.
-
-<Canvas>
-  <Story id="components-componentlibrary-label--required" />
-</Canvas>
-
-```jsx
-import { Label } from '../../component-library';
-
-<Label required>Label</Label>;
-```
-
-```jsx
-import { Label } from '../../component-library';
-
-<Label disabled>Label</Label>;
-```
+- [Figma component](https://www.figma.com/file/HKpPKij9V3TpsyMV1TpV7C/branch/7uyrueQIFQBLqo9uzkxclr/DS-Components?node-id=13879%3A38076&t=dBHjnJTMSVE8N2UP-1)
+- [Insight report](https://www.figma.com/file/aGW8sk6X6Jf9ac0MRMD4kX/TextField-Audit?node-id=282%3A22&t=ZgCGFwGOBmOwQR5c-1)
diff --git a/ui/components/component-library/label/label.js b/ui/components/component-library/label/label.js
index 1054c6c49..c7cfa08b7 100644
--- a/ui/components/component-library/label/label.js
+++ b/ui/components/component-library/label/label.js
@@ -3,14 +3,13 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { Text } from '../text';
 import {
-  Color,
   FONT_WEIGHT,
   TextVariant,
   DISPLAY,
   AlignItems,
 } from '../../../helpers/constants/design-system';
 
-export const Label = ({ htmlFor, required, className, children, ...props }) => (
+export const Label = ({ htmlFor, className, children, ...props }) => (
   <Text
     className={classnames(
       'mm-label',
@@ -26,16 +25,6 @@ export const Label = ({ htmlFor, required, className, children, ...props }) => (
     {...props}
   >
     {children}
-    {required && (
-      <Text
-        as="span"
-        className="mm-label__required-asterisk"
-        aria-hidden="true"
-        color={Color.errorDefault}
-      >
-        *
-      </Text>
-    )}
   </Text>
 );
 
@@ -48,10 +37,6 @@ Label.propTypes = {
    * The id of the input associated with the label
    */
   htmlFor: PropTypes.string,
-  /**
-   * If true the label will display as required
-   */
-  required: PropTypes.bool,
   /**
    * Additional classNames to be added to the label component
    */
diff --git a/ui/components/component-library/label/label.stories.js b/ui/components/component-library/label/label.stories.js
index 09ca7f113..ed29d7442 100644
--- a/ui/components/component-library/label/label.stories.js
+++ b/ui/components/component-library/label/label.stories.js
@@ -28,9 +28,6 @@ export default {
     htmlFor: {
       control: 'text',
     },
-    required: {
-      control: 'boolean',
-    },
     children: {
       control: 'text',
     },
@@ -96,8 +93,3 @@ HtmlFor.args = {
   children: 'Network name',
   htmlFor: 'add-network',
 };
-
-export const Required = Template.bind({});
-Required.args = {
-  required: true,
-};
diff --git a/ui/components/component-library/label/label.test.js b/ui/components/component-library/label/label.test.js
index 94c693fde..6a7ddb254 100644
--- a/ui/components/component-library/label/label.test.js
+++ b/ui/components/component-library/label/label.test.js
@@ -57,9 +57,4 @@ describe('label', () => {
     fireEvent.click(label);
     expect(input).toHaveFocus();
   });
-  it('should render with required asterisk', () => {
-    const { getByText } = render(<Label required>label</Label>);
-    expect(getByText('label')).toBeDefined();
-    expect(getByText('*')).toBeDefined();
-  });
 });

From c4caef5e12e8221d08e882f5d66c2a7bcc9488bd Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Fri, 17 Mar 2023 10:36:20 -0700
Subject: [PATCH 023/129] Sign in with Ethereum: re-enable warning UI for
 mismatched domains / disable domain binding (#18200)

* siwe: re-enable warning UI for mismatched domains
- unblocks mismatched domain support
- we may re-add error handling here #18184
- reverts logic from #16616

* siwe: fix mismatch domain warning msg UI

* lint: rm whitespace EOL

* siwe: rm unit test

* lint: fix whitespace

* Revert "siwe: rm unit test"

This reverts commit c80a4a2e661609c46c76d1e43e05909b6db3f0f5.

---------

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
---
 app/scripts/lib/personal-message-manager.js       |  9 ---------
 app/scripts/lib/personal-message-manager.test.js  | 10 ----------
 .../app/signature-request-siwe/index.scss         | 15 +++++++++++----
 .../signature-request-siwe.js                     |  1 -
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/app/scripts/lib/personal-message-manager.js b/app/scripts/lib/personal-message-manager.js
index 8440fa4ce..bb0a2b0c1 100644
--- a/app/scripts/lib/personal-message-manager.js
+++ b/app/scripts/lib/personal-message-manager.js
@@ -153,15 +153,6 @@ export default class PersonalMessageManager extends EventEmitter {
     const siwe = detectSIWE(msgParams);
     msgParams.siwe = siwe;
 
-    if (siwe.isSIWEMessage && req.origin) {
-      const { host } = new URL(req.origin);
-      if (siwe.parsedMessage.domain !== host) {
-        throw new Error(
-          `SIWE domain is not valid: "${host}" !== "${siwe.parsedMessage.domain}"`,
-        );
-      }
-    }
-
     // create txData obj with parameters and meta data
     const time = new Date().getTime();
     const msgId = createId();
diff --git a/app/scripts/lib/personal-message-manager.test.js b/app/scripts/lib/personal-message-manager.test.js
index a4f8f4613..e565c0229 100644
--- a/app/scripts/lib/personal-message-manager.test.js
+++ b/app/scripts/lib/personal-message-manager.test.js
@@ -178,15 +178,5 @@ describe('Personal Message Manager', () => {
       const result2 = messageManager.getMsg(msgId2);
       expect(result2.msgParams.siwe.isSIWEMessage).toStrictEqual(false);
     });
-
-    it("should throw an error if the SIWE message's domain doesn't match", async () => {
-      const request = { origin: 'https://mismatched-domain.com' };
-      const { host: siweDomain } = new URL(origin);
-      const { host: browserDomain } = new URL(request.origin);
-      const expectedError = `SIWE domain is not valid: "${browserDomain}" !== "${siweDomain}"`;
-      await expect(async () => {
-        await messageManager.addUnapprovedMessage(msgParams, request);
-      }).rejects.toThrow(expectedError);
-    });
   });
 });
diff --git a/ui/components/app/signature-request-siwe/index.scss b/ui/components/app/signature-request-siwe/index.scss
index a6de5df10..2dedc438a 100644
--- a/ui/components/app/signature-request-siwe/index.scss
+++ b/ui/components/app/signature-request-siwe/index.scss
@@ -21,18 +21,25 @@
     box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
   }
 
+  /** @todo replace ActionableMessage or remove overwritten code. */
   .signature-request-siwe__actionable-message {
-    margin: 0 16px 16px;
+    margin: 0 16px;
+    flex-direction: row;
+    align-items: initial;
 
     .icon {
       position: absolute;
       left: 17px;
       top: 13px;
     }
-  }
 
-  .actionable-message--with-icon.actionable-message--with-right-button {
-    padding-left: 48px;
+    .actionable-message__message {
+      padding-left: 16px;
+    }
+
+    &.actionable-message--with-icon {
+      padding-left: 16px;
+    }
   }
 }
 
diff --git a/ui/components/app/signature-request-siwe/signature-request-siwe.js b/ui/components/app/signature-request-siwe/signature-request-siwe.js
index 9aae89228..4ae5533eb 100644
--- a/ui/components/app/signature-request-siwe/signature-request-siwe.js
+++ b/ui/components/app/signature-request-siwe/signature-request-siwe.js
@@ -131,7 +131,6 @@ export default function SignatureRequestSIWE({
           }
           iconFillColor="var(--color-error-default)"
           useIcon
-          withRightButton
           icon={<Icon name="danger" color={IconColor.errorDefault} />}
         />
       )}

From 33a25cd6e9b27dcf8e778730f075c11d29fd8c4f Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Fri, 17 Mar 2023 11:51:58 -0700
Subject: [PATCH 024/129] Ignoring all storybook files from coverage check
 .stories.* (#18225)

---
 test/merge-coverage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/merge-coverage.js b/test/merge-coverage.js
index 36e17c079..9cf8cad20 100644
--- a/test/merge-coverage.js
+++ b/test/merge-coverage.js
@@ -233,7 +233,7 @@ async function start() {
               // checking test file coverage is redundant.
               '!**/*.test.js',
               '!**/__mocks__/**/*.js',
-              '!**/*.stories.js',
+              '!**/*.stories.*',
             ]),
             coverageMap,
           );

From c940f744a548ef3e6360a550aff2e97cbb6ef80d Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Mon, 20 Mar 2023 10:29:18 +0100
Subject: [PATCH 025/129] [e2e] Using ganache requests to getBalance and
 getAccounts (#18215)

* Using ganache requests to get balances

* Replace getBalance getAccounts with ganache funcs

* Add secondary ganache server to testsuite
---
 test/e2e/ganache.js                           | 21 +++++++++++++++++++
 test/e2e/helpers.js                           |  2 ++
 test/e2e/tests/contract-interactions.spec.js  | 10 ++++-----
 test/e2e/tests/metamask-responsive-ui.spec.js |  5 +++--
 test/e2e/tests/navigate-transactions.spec.js  |  7 ++++---
 test/e2e/tests/onboarding.spec.js             |  7 ++++---
 test/e2e/tests/permissions.spec.js            |  5 +++--
 test/e2e/tests/personal-sign.spec.js          |  5 +++--
 test/e2e/tests/provider-api.spec.js           |  9 ++++----
 test/e2e/tests/send-hex-address.spec.js       | 10 +++++----
 test/e2e/tests/signature-request.spec.js      | 15 +++++++------
 11 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/test/e2e/ganache.js b/test/e2e/ganache.js
index 107b879ed..4285ea41d 100644
--- a/test/e2e/ganache.js
+++ b/test/e2e/ganache.js
@@ -23,6 +23,27 @@ class Ganache {
     return this._server.provider;
   }
 
+  async getAccounts() {
+    return await this.getProvider().request({
+      method: 'eth_accounts',
+      params: [],
+    });
+  }
+
+  async getBalance() {
+    const accounts = await this.getAccounts();
+    const balanceHex = await this.getProvider().request({
+      method: 'eth_getBalance',
+      params: [accounts[0], 'latest'],
+    });
+    const balanceInt = parseInt(balanceHex, 16) / 10 ** 18;
+
+    const balanceFormatted =
+      balanceInt % 1 === 0 ? balanceInt : balanceInt.toFixed(4);
+
+    return balanceFormatted;
+  }
+
   async quit() {
     if (!this._server) {
       throw new Error('Server not running yet');
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 231fa0b57..2569dd4a3 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -145,6 +145,8 @@ async function withFixtures(options, testSuite) {
       driver: driverProxy ?? driver,
       mockServer,
       contractRegistry,
+      ganacheServer,
+      secondaryGanacheServer,
     });
   } catch (error) {
     failed = true;
diff --git a/test/e2e/tests/contract-interactions.spec.js b/test/e2e/tests/contract-interactions.spec.js
index 98b562a2e..b13fe9826 100644
--- a/test/e2e/tests/contract-interactions.spec.js
+++ b/test/e2e/tests/contract-interactions.spec.js
@@ -25,7 +25,7 @@ describe('Deploy contract and call contract methods', function () {
         smartContract,
         title: this.test.title,
       },
-      async ({ driver, contractRegistry }) => {
+      async ({ driver, contractRegistry, ganacheServer }) => {
         const contractAddress = await contractRegistry.getContractAddress(
           smartContract,
         );
@@ -99,15 +99,15 @@ describe('Deploy contract and call contract methods', function () {
 
         // renders the correct ETH balance
         await driver.switchToWindow(extension);
-        const balance = await driver.waitForSelector(
+        const balance = await ganacheServer.getBalance();
+        const balanceElement = await driver.waitForSelector(
           {
             css: '[data-testid="eth-overview__primary-currency"]',
-            text: '21.',
+            text: balance,
           },
           { timeout: 10000 },
         );
-        const tokenAmount = await balance.getText();
-        assert.ok(/^21.*\s*ETH.*$/u.test(tokenAmount));
+        assert.equal(`${balance}\nETH`, await balanceElement.getText());
       },
     );
   });
diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js
index 8dc91e0b4..36811bc38 100644
--- a/test/e2e/tests/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/metamask-responsive-ui.spec.js
@@ -84,7 +84,7 @@ describe('MetaMask Responsive UI', function () {
         title: this.test.title,
         failOnConsoleError: false,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
         await driver.navigate();
 
         // Import Secret Recovery Phrase
@@ -104,9 +104,10 @@ describe('MetaMask Responsive UI', function () {
         await driver.press('#confirm-password', driver.Key.ENTER);
 
         // balance renders
+        const balance = await ganacheServer.getBalance();
         await driver.waitForSelector({
           css: '[data-testid="eth-overview__primary-currency"]',
-          text: '1000 ETH',
+          text: `${balance} ETH`,
         });
       },
     );
diff --git a/test/e2e/tests/navigate-transactions.spec.js b/test/e2e/tests/navigate-transactions.spec.js
index 4d4136732..3e272838d 100644
--- a/test/e2e/tests/navigate-transactions.spec.js
+++ b/test/e2e/tests/navigate-transactions.spec.js
@@ -228,7 +228,7 @@ describe('Navigate transactions', function () {
         ganacheOptions,
         title: this.test.title,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
@@ -236,10 +236,11 @@ describe('Navigate transactions', function () {
         // reject transactions
         await driver.clickElement({ text: 'Reject 4', tag: 'a' });
         await driver.clickElement({ text: 'Reject all', tag: 'button' });
-        const balance = await driver.findElement(
+        const balance = await ganacheServer.getBalance();
+        const balanceElement = await driver.findElement(
           '[data-testid="eth-overview__primary-currency"]',
         );
-        assert.ok(/^25\sETH$/u.test(await balance.getText()));
+        assert.equal(`${balance}\nETH`, await balanceElement.getText());
       },
     );
   });
diff --git a/test/e2e/tests/onboarding.spec.js b/test/e2e/tests/onboarding.spec.js
index 2c4b8e6bb..7778989d3 100644
--- a/test/e2e/tests/onboarding.spec.js
+++ b/test/e2e/tests/onboarding.spec.js
@@ -260,7 +260,7 @@ describe('MetaMask onboarding', function () {
         title: this.test.title,
       },
 
-      async ({ driver }) => {
+      async ({ driver, secondaryGanacheServer }) => {
         await driver.navigate();
         await importSRPOnboardingFlow(driver, testSeedPhrase, testPassword);
 
@@ -300,10 +300,11 @@ describe('MetaMask onboarding', function () {
         );
         assert.equal(await networkDisplay.getText(), networkName);
 
-        const balance1 = await driver.findElement(
+        const balance = await secondaryGanacheServer.getBalance();
+        const balanceElement = await driver.findElement(
           '[data-testid="eth-overview__primary-currency"]',
         );
-        assert.ok(/^10\sETH$/u.test(await balance1.getText()));
+        assert.equal(`${balance}\nETH`, await balanceElement.getText());
       },
     );
   });
diff --git a/test/e2e/tests/permissions.spec.js b/test/e2e/tests/permissions.spec.js
index 3ebcbf117..3f61a7689 100644
--- a/test/e2e/tests/permissions.spec.js
+++ b/test/e2e/tests/permissions.spec.js
@@ -13,7 +13,6 @@ describe('Permissions', function () {
         },
       ],
     };
-    const publicAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
     await withFixtures(
       {
         dapp: true,
@@ -21,7 +20,9 @@ describe('Permissions', function () {
         ganacheOptions,
         title: this.test.title,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
+        const addresses = await ganacheServer.getAccounts();
+        const publicAddress = addresses[0];
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
diff --git a/test/e2e/tests/personal-sign.spec.js b/test/e2e/tests/personal-sign.spec.js
index 0622595d3..1a6d904f2 100644
--- a/test/e2e/tests/personal-sign.spec.js
+++ b/test/e2e/tests/personal-sign.spec.js
@@ -13,7 +13,6 @@ describe('Personal sign', function () {
         },
       ],
     };
-    const publicAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
     await withFixtures(
       {
         dapp: true,
@@ -23,7 +22,9 @@ describe('Personal sign', function () {
         ganacheOptions,
         title: this.test.title,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
+        const addresses = await ganacheServer.getAccounts();
+        const publicAddress = addresses[0];
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
diff --git a/test/e2e/tests/provider-api.spec.js b/test/e2e/tests/provider-api.spec.js
index 449f894bd..50cac9cef 100644
--- a/test/e2e/tests/provider-api.spec.js
+++ b/test/e2e/tests/provider-api.spec.js
@@ -24,7 +24,9 @@ describe('MetaMask', function () {
         ganacheOptions,
         title: this.test.title,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
+        const addresses = await ganacheServer.getAccounts();
+        const publicAddress = addresses[0];
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
@@ -60,10 +62,7 @@ describe('MetaMask', function () {
 
         assert.equal(await switchedNetworkDiv.getText(), '0x1');
         assert.equal(await switchedChainIdDiv.getText(), '0x1');
-        assert.equal(
-          await accountsDiv.getText(),
-          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-        );
+        assert.equal(await accountsDiv.getText(), publicAddress);
       },
     );
   });
diff --git a/test/e2e/tests/send-hex-address.spec.js b/test/e2e/tests/send-hex-address.spec.js
index 32301d325..3e03dfd31 100644
--- a/test/e2e/tests/send-hex-address.spec.js
+++ b/test/e2e/tests/send-hex-address.spec.js
@@ -129,13 +129,14 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
         title: this.test.title,
         failOnConsoleError: false,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
+        const balanceAfterDeployment = await ganacheServer.getBalance();
         await driver.waitForSelector({
           css: '[data-testid="eth-overview__primary-currency"]',
-          text: '24.9977 ETH',
+          text: `${balanceAfterDeployment} ETH`,
         });
 
         // Send TST
@@ -194,13 +195,14 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
         title: this.test.title,
         failOnConsoleError: false,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
+        const balanceAfterDeployment = await ganacheServer.getBalance();
         await driver.waitForSelector({
           css: '[data-testid="eth-overview__primary-currency"]',
-          text: '24.9977 ETH',
+          text: `${balanceAfterDeployment} ETH`,
         });
 
         // Send TST
diff --git a/test/e2e/tests/signature-request.spec.js b/test/e2e/tests/signature-request.spec.js
index 91a91eaf0..9b508d37b 100644
--- a/test/e2e/tests/signature-request.spec.js
+++ b/test/e2e/tests/signature-request.spec.js
@@ -17,7 +17,6 @@ describe('Sign Typed Data V4 Signature Request', function () {
         },
       ],
     };
-    const publicAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
     await withFixtures(
       {
         dapp: true,
@@ -27,7 +26,9 @@ describe('Sign Typed Data V4 Signature Request', function () {
         ganacheOptions,
         title: this.test.title,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
+        const addresses = await ganacheServer.getAccounts();
+        const publicAddress = addresses[0];
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
@@ -97,7 +98,6 @@ describe('Sign Typed Data V3 Signature Request', function () {
         },
       ],
     };
-    const publicAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
     await withFixtures(
       {
         dapp: true,
@@ -107,7 +107,9 @@ describe('Sign Typed Data V3 Signature Request', function () {
         ganacheOptions,
         title: this.test.title,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
+        const addresses = await ganacheServer.getAccounts();
+        const publicAddress = addresses[0];
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
@@ -178,7 +180,6 @@ describe('Sign Typed Data Signature Request', function () {
         },
       ],
     };
-    const publicAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
     await withFixtures(
       {
         dapp: true,
@@ -188,7 +189,9 @@ describe('Sign Typed Data Signature Request', function () {
         ganacheOptions,
         title: this.test.title,
       },
-      async ({ driver }) => {
+      async ({ driver, ganacheServer }) => {
+        const addresses = await ganacheServer.getAccounts();
+        const publicAddress = addresses[0];
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);

From c59e2b4d4433481da5b75a11d27ef772c1b54162 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Mon, 20 Mar 2023 12:32:03 +0100
Subject: [PATCH 026/129] [FLASK] Add tooltips to show info about a permission
 (#17685)

* Add tooltips to show info about a permission

* Make Tooltip component in scope regardless of build type

* Add descriptions

* Add translation variables and fix tooltip

* Use new icons

* Add missing description after rebase

* Fix build issues

* Fix icons

* Fix translation

* Add missing description

* Fix Ethereum icon

* Update coverage
---
 app/_locales/en/messages.json                 |  68 +++++
 app/images/icons/ethereum.svg                 |   3 +
 coverage-targets.js                           |   2 +-
 .../update-snap-permission-list/index.scss    |  15 ++
 .../update-snap-permission-list.js            |  16 +-
 .../index.scss                                |  23 +-
 .../permissions-connect-permission-list.js    |  22 +-
 ui/helpers/utils/permission.js                | 253 ++++++++++++++----
 8 files changed, 331 insertions(+), 71 deletions(-)
 create mode 100644 app/images/icons/ethereum.svg

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 59eae8ed9..733e0edc8 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -2773,22 +2773,42 @@
     "message": "Access the internet.",
     "description": "The description of the `endowment:network-access` permission."
   },
+  "permission_accessNetworkDescription": {
+    "message": "Allow the snap to access the internet. This can be used to both send and receive data with third-party servers.",
+    "description": "An extended description of the `endowment:network-access` permission."
+  },
   "permission_accessSnap": {
     "message": "Connect to the $1 snap.",
     "description": "The description for the `wallet_snap` permission. $1 is the name of the snap."
   },
+  "permission_accessSnapDescription": {
+    "message": "Allow the website or snap to interact with $1.",
+    "description": "The description for the `wallet_snap_*` permission. $1 is the name of the Snap."
+  },
   "permission_cronjob": {
     "message": "Schedule and execute periodic actions.",
     "description": "The description for the `snap_cronjob` permission"
   },
+  "permission_cronjobDescription": {
+    "message": "Allow the snap to perform actions that run periodically at fixed times, dates, or intervals. This can be used to trigger time-sensitive interactions or notifications.",
+    "description": "An extended description for the `snap_cronjob` permission"
+  },
   "permission_customConfirmation": {
     "message": "Display a confirmation in MetaMask.",
     "description": "The description for the `snap_confirm` permission"
   },
+  "permission_customConfirmationDescription": {
+    "message": "Allow the snap to display MetaMask popups with custom text, and buttons to approve or reject an action.",
+    "description": "An extended description for the `snap_confirm` permission"
+  },
   "permission_dialog": {
     "message": "Display dialog windows in MetaMask.",
     "description": "The description for the `snap_dialog` permission"
   },
+  "permission_dialogDescription": {
+    "message": "Allow the snap to display MetaMask popups with custom text, input field, and buttons to approve or reject an action.\nCan be used to create e.g. alerts, confirmations, and opt-in flows for a snap.",
+    "description": "An extended description for the `snap_dialog` permission"
+  },
   "permission_ethereumAccounts": {
     "message": "See address, account balance, activity and suggest transactions to approve",
     "description": "The description for the `eth_accounts` permission"
@@ -2797,22 +2817,42 @@
     "message": "Access the Ethereum provider.",
     "description": "The description for the `endowment:ethereum-provider` permission"
   },
+  "permission_ethereumProviderDescription": {
+    "message": "Allow the snap to communicate with MetaMask directly, in order for it to read data from the blockchain and suggest messages and transactions.",
+    "description": "An extended description for the `endowment:ethereum-provider` permission"
+  },
   "permission_getEntropy": {
     "message": "Derive arbitrary keys unique to this snap.",
     "description": "The description for the `snap_getEntropy` permission"
   },
+  "permission_getEntropyDescription": {
+    "message": "Allow the snap to derive arbitrary keys unique to this snap, without exposing them. These keys are separate from your MetaMask account(s) and not related to your private keys or Secret Recovery Phrase. Other snaps cannot access this information.",
+    "description": "An extended description for the `snap_getEntropy` permission"
+  },
   "permission_longRunning": {
     "message": "Run indefinitely.",
     "description": "The description for the `endowment:long-running` permission"
   },
+  "permission_longRunningDescription": {
+    "message": "Allow the snap to run indefinitely while, for example, processing large amounts of data.",
+    "description": "An extended description for the `endowment:long-running` permission"
+  },
   "permission_manageBip32Keys": {
     "message": "Control your accounts and assets under $1 ($2).",
     "description": "The description for the `snap_getBip32Entropy` permission. $1 is a derivation path, e.g. 'm/44'/0'/0''. $2 is the elliptic curve name, e.g. 'secp256k1'."
   },
+  "permission_manageBip32KeysDescription": {
+    "message": "Allow the snap to derive BIP-32 key pairs based on your Secret Recovery Phrase without exposing it. This grants full access to all accounts and assets on $1.\nWith the power to manage keys, the snap can support a variety of blockchain protocols beyond Ethereum (EVMs).",
+    "description": "An extended description for the `snap_getBip32Entropy` permission. $1 is a derivation path (name)"
+  },
   "permission_manageBip44Keys": {
     "message": "Control your \"$1\" accounts and assets.",
     "description": "The description for the `snap_getBip44Entropy` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
   },
+  "permission_manageBip44KeysDescription": {
+    "message": "Allow the snap to derive BIP-44 key pairs based on your Secret Recovery Phrase without exposing it. This grants full access to all accounts and assets on $1.\nWith the power to manage keys, the snap can support a variety of blockchain protocols beyond Ethereum (EVMs).",
+    "description": "An extended description for the `snap_getBip44Entropy` permission. $1 is the name of a protocol, e.g., 'Filecoin'."
+  },
   "permission_manageNamedBip32Keys": {
     "message": "Control your $1 accounts and assets.",
     "description": "The description for the `snap_getBip32Entropy` permission. $1 is a name for the derivation path, e.g., 'Ethereum accounts'. $2 is the plain derivation path, e.g. 'm/44'/0'/0''."
@@ -2821,22 +2861,42 @@
     "message": "Store and manage its data on your device.",
     "description": "The description for the `snap_manageState` permission"
   },
+  "permission_manageStateDescription": {
+    "message": "Allow the snap to store, update, and retrieve data securely with encryption. Other snaps cannot access this information.",
+    "description": "An extended description for the `snap_manageState` permission"
+  },
   "permission_notifications": {
     "message": "Show notifications.",
     "description": "The description for the `snap_notify` permission"
   },
+  "permission_notificationsDescription": {
+    "message": "Allow the snap to display notifications within MetaMask. A short notification text can be triggered by a snap for actionable or time-sensitive information.",
+    "description": "An extended description for the `snap_notify` permission"
+  },
   "permission_rpc": {
     "message": "Allow $1 to communicate directly with this snap.",
     "description": "The description for the `endowment:rpc` permission. $1 is 'other snaps' or 'websites'."
   },
+  "permission_rpcDescription": {
+    "message": "Allow $1 to send messages to the snap and receive a response from the snap.",
+    "description": "An extended description for the `endowment:rpc` permission. $1 is 'other snaps' or 'websites'."
+  },
   "permission_transactionInsight": {
     "message": "Fetch and display transaction insights.",
     "description": "The description for the `endowment:transaction-insight` permission"
   },
+  "permission_transactionInsightDescription": {
+    "message": "Allow the snap to decode transactions and show insights within the MetaMask UI. This can be used for anti-phishing and security solutions.",
+    "description": "An extended description for the `endowment:transaction-insight` permission"
+  },
   "permission_transactionInsightOrigin": {
     "message": "See the origins of websites that suggest transactions",
     "description": "The description for the `transactionOrigin` caveat, to be used with the `endowment:transaction-insight` permission"
   },
+  "permission_transactionInsightOriginDescription": {
+    "message": "Allow the snap to see the origin (URI) of websites that suggest transactions. This can be used for anti-phishing and security solutions.",
+    "description": "An extended description for the `transactionOrigin` caveat, to be used with the `endowment:transaction-insight` permission"
+  },
   "permission_unknown": {
     "message": "Unknown permission: $1",
     "description": "$1 is the name of a requested permission that is not recognized."
@@ -2845,6 +2905,10 @@
     "message": "View your public key for $1 ($2).",
     "description": "The description for the `snap_getBip32PublicKey` permission. $1 is a derivation path, e.g. 'm/44'/0'/0''. $2 is the elliptic curve name, e.g. 'secp256k1'."
   },
+  "permission_viewBip32PublicKeysDescription": {
+    "message": "Allow the snap to view your public keys (and addresses) for $1. This does not grant any control of accounts or assets.",
+    "description": "An extended description for the `snap_getBip32PublicKey` permission. $1 is a derivation path (name)"
+  },
   "permission_viewNamedBip32PublicKeys": {
     "message": "View your public key for $1.",
     "description": "The description for the `snap_getBip32PublicKey` permission. $1 is a name for the derivation path, e.g., 'Ethereum accounts'."
@@ -2853,6 +2917,10 @@
     "message": "Support for WebAssembly.",
     "description": "The description of the `endowment:webassembly` permission."
   },
+  "permission_webAssemblyDescription": {
+    "message": "Allow the snap to access low-level execution environments via WebAssembly.",
+    "description": "An extended description of the `endowment:webassembly` permission."
+  },
   "permissions": {
     "message": "Permissions"
   },
diff --git a/app/images/icons/ethereum.svg b/app/images/icons/ethereum.svg
new file mode 100644
index 000000000..f3e509708
--- /dev/null
+++ b/app/images/icons/ethereum.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 417 417">
+  <path d="m80.5 212.3 64 37.8 64 37.9 127.9-75.7L208.5 0l-128 212.3z"/><path d="m336.5 236.6-128 75.6-128-75.6 128 180.3z"/>
+</svg>
diff --git a/coverage-targets.js b/coverage-targets.js
index d85aa5021..e221e9466 100644
--- a/coverage-targets.js
+++ b/coverage-targets.js
@@ -9,7 +9,7 @@ module.exports = {
     lines: 65,
     branches: 53.5,
     statements: 64,
-    functions: 57.5,
+    functions: 57.4,
   },
   transforms: {
     branches: 100,
diff --git a/ui/components/app/flask/update-snap-permission-list/index.scss b/ui/components/app/flask/update-snap-permission-list/index.scss
index 8c35bc9ab..5cc67a8e8 100644
--- a/ui/components/app/flask/update-snap-permission-list/index.scss
+++ b/ui/components/app/flask/update-snap-permission-list/index.scss
@@ -44,4 +44,19 @@
   .permission-description-subtext {
     @include H7;
   }
+
+  .permission {
+    &__tooltip-icon {
+      margin-left: auto !important;
+      padding-left: 16px;
+
+      i {
+        color: var(--color-icon-muted);
+      }
+
+      &__warning i {
+        color: var(--color-warning-default);
+      }
+    }
+  }
 }
diff --git a/ui/components/app/flask/update-snap-permission-list/update-snap-permission-list.js b/ui/components/app/flask/update-snap-permission-list/update-snap-permission-list.js
index 5370c30c3..f787628e9 100644
--- a/ui/components/app/flask/update-snap-permission-list/update-snap-permission-list.js
+++ b/ui/components/app/flask/update-snap-permission-list/update-snap-permission-list.js
@@ -1,7 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { isFunction } from 'lodash';
-import { getWeightedPermissions } from '../../../../helpers/utils/permission';
+import {
+  getRightIcon,
+  getWeightedPermissions,
+} from '../../../../helpers/utils/permission';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { formatDate } from '../../../../helpers/utils/util';
 import Typography from '../../../ui/typography/typography';
@@ -15,8 +18,9 @@ export default function UpdateSnapPermissionList({
   const t = useI18nContext();
 
   const Permissions = ({ className, permissions, subText }) => {
-    return getWeightedPermissions(t, permissions).map(
-      ({ label, rightIcon, permissionName, permissionValue }) => (
+    return getWeightedPermissions(t, permissions).map((permission) => {
+      const { label, permissionName, permissionValue } = permission;
+      return (
         <div className={className} key={permissionName}>
           <i className="fas fa-x" />
           <div className="permission-description">
@@ -31,10 +35,10 @@ export default function UpdateSnapPermissionList({
                 : subText}
             </Typography>
           </div>
-          {rightIcon && <i className={rightIcon} />}
+          {getRightIcon(permission)}
         </div>
-      ),
-    );
+      );
+    });
   };
 
   return (
diff --git a/ui/components/app/permissions-connect-permission-list/index.scss b/ui/components/app/permissions-connect-permission-list/index.scss
index 5d61c83b2..8411cc327 100644
--- a/ui/components/app/permissions-connect-permission-list/index.scss
+++ b/ui/components/app/permissions-connect-permission-list/index.scss
@@ -6,7 +6,7 @@
 
     width: 100%;
     padding-bottom: 16px;
-    border-bottom: 1px solid var(--color-border-default);
+    border-bottom: 1px solid var(--color-border-muted);
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -21,9 +21,30 @@
       font-size: 1rem;
       text-align: center;
     }
+
+    .mm-avatar-icon {
+      margin: 16px 16px 16px 0;
+    }
+
+    &__tooltip-icon {
+      margin-left: auto !important;
+      padding-left: 16px;
+
+      i {
+        color: var(--color-icon-muted);
+      }
+
+      &__warning i {
+        color: var(--color-warning-default);
+      }
+    }
   }
 
   .permission-label-item {
     font-weight: bold;
   }
 }
+
+.tooltip-label-item {
+  font-weight: bold;
+}
diff --git a/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js b/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js
index da8fa8355..99b554ec5 100644
--- a/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js
+++ b/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js
@@ -1,28 +1,26 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { getWeightedPermissions } from '../../../helpers/utils/permission';
+import {
+  getRightIcon,
+  getWeightedPermissions,
+} from '../../../helpers/utils/permission';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 
 /**
  * Get one or more permission descriptions for a permission name.
  *
  * @param permission - The permission to render.
- * @param permission.label - The text label.
- * @param permission.leftIcon - The left icon.
- * @param permission.rightIcon - The right icon.
- * @param permission.permissionName - The name of the permission.
- * @param index - The index of the permission in the permissions array.
- * @returns {JSX.Element[]} An array of permission description nodes.
+ * @param index - The index of the permission.
+ * @returns {JSX.Element} A permission description node.
  */
-function getDescriptionNode(
-  { label, leftIcon, rightIcon, permissionName },
-  index,
-) {
+function getDescriptionNode(permission, index) {
+  const { label, leftIcon, permissionName } = permission;
+
   return (
     <div className="permission" key={`${permissionName}-${index}`}>
       {typeof leftIcon === 'string' ? <i className={leftIcon} /> : leftIcon}
       {label}
-      {rightIcon && <i className={rightIcon} />}
+      {getRightIcon(permission)}
     </div>
   );
 }
diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js
index d33b88ce1..41d8df434 100644
--- a/ui/helpers/utils/permission.js
+++ b/ui/helpers/utils/permission.js
@@ -6,15 +6,24 @@ import { getRpcCaveatOrigins } from '@metamask/snaps-controllers/dist/snaps/endo
 import { SnapCaveatType } from '@metamask/snaps-utils';
 import { isNonEmptyArray } from '@metamask/controller-utils';
 ///: END:ONLY_INCLUDE_IN
+import classnames from 'classnames';
 import {
   RestrictedMethods,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   EndowmentPermissions,
   ///: END:ONLY_INCLUDE_IN
 } from '../../../shared/constants/permissions';
-import { Icon, ICON_NAMES } from '../../components/component-library';
-import { Color } from '../constants/design-system';
+import Tooltip from '../../components/ui/tooltip';
+import {
+  AvatarIcon,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  Icon,
+  ///: END:ONLY_INCLUDE_IN
+  ICON_NAMES,
+  ICON_SIZES,
+} from '../../components/component-library';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
+import { IconColor } from '../constants/design-system';
 import {
   coinTypeToProtocolName,
   getSnapDerivationPathName,
@@ -24,45 +33,70 @@ import {
 
 const UNKNOWN_PERMISSION = Symbol('unknown');
 
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+const RIGHT_WARNING_ICON = (
+  <Icon
+    name={ICON_NAMES.DANGER}
+    size={ICON_SIZES.SM}
+    color={IconColor.warningDefault}
+  />
+);
+
+const RIGHT_INFO_ICON = (
+  <Icon
+    name={ICON_NAMES.INFO}
+    size={ICON_SIZES.SM}
+    color={IconColor.iconMuted}
+  />
+);
+///: END:ONLY_INCLUDE_IN
+
+function getLeftIcon(iconName) {
+  return (
+    <AvatarIcon
+      iconName={iconName}
+      size={ICON_SIZES.SM}
+      iconProps={{
+        size: ICON_SIZES.XS,
+      }}
+    />
+  );
+}
+
 const PERMISSION_DESCRIPTIONS = deepFreeze({
   [RestrictedMethods.eth_accounts]: (t) => ({
     label: t('permission_ethereumAccounts'),
-    leftIcon: (
-      <Icon name={ICON_NAMES.EYE} margin={4} color={Color.iconAlternative} />
-    ),
+    leftIcon: getLeftIcon(ICON_NAMES.EYE),
     rightIcon: null,
     weight: 2,
   }),
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   [RestrictedMethods.snap_confirm]: (t) => ({
     label: t('permission_customConfirmation'),
-    leftIcon: 'fas fa-user-check',
-    rightIcon: null,
+    description: t('permission_customConfirmationDescription'),
+    leftIcon: getLeftIcon(ICON_NAMES.SECURITY_TICK),
+    rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
   [RestrictedMethods.snap_dialog]: (t) => ({
     label: t('permission_dialog'),
-    leftIcon: 'fas fa-user-check',
-    rightIcon: null,
+    description: t('permission_dialogDescription'),
+    leftIcon: getLeftIcon(ICON_NAMES.MESSAGES),
+    rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
   [RestrictedMethods.snap_notify]: (t) => ({
-    leftIcon: <Icon name={ICON_NAMES.NOTIFICATION} />,
     label: t('permission_notifications'),
-    rightIcon: null,
+    description: t('permission_notificationsDescription'),
+    leftIcon: getLeftIcon(ICON_NAMES.NOTIFICATION),
+    rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
   [RestrictedMethods.snap_getBip32PublicKey]: (t, _, permissionValue) =>
     permissionValue.caveats[0].value.map(({ path, curve }) => {
       const baseDescription = {
-        leftIcon: (
-          <Icon
-            name={ICON_NAMES.EYE}
-            margin={4}
-            color={Color.iconAlternative}
-          />
-        ),
-        rightIcon: null,
+        leftIcon: getLeftIcon(ICON_NAMES.SECURITY_SEARCH),
+        rightIcon: RIGHT_WARNING_ICON,
         weight: 1,
       };
 
@@ -76,6 +110,15 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
             </span>,
             path.join('/'),
           ]),
+          description: t('permission_viewBip32PublicKeysDescription', [
+            <span
+              className="tooltip-label-item"
+              key={`description-${path.join('/')}`}
+            >
+              {friendlyName}
+            </span>,
+            path.join('/'),
+          ]),
         };
       }
 
@@ -87,13 +130,22 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
           </span>,
           curve,
         ]),
+        description: t('permission_viewBip32PublicKeysDescription', [
+          <span
+            className="tooltip-label-item"
+            key={`description-${path.join('/')}`}
+          >
+            {path.join('/')}
+          </span>,
+          path.join('/'),
+        ]),
       };
     }),
   [RestrictedMethods.snap_getBip32Entropy]: (t, _, permissionValue) =>
     permissionValue.caveats[0].value.map(({ path, curve }) => {
       const baseDescription = {
-        leftIcon: 'fas fa-door-open',
-        rightIcon: null,
+        leftIcon: getLeftIcon(ICON_NAMES.KEY),
+        rightIcon: RIGHT_WARNING_ICON,
         weight: 1,
       };
 
@@ -107,6 +159,15 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
             </span>,
             path.join('/'),
           ]),
+          description: t('permission_manageBip32KeysDescription', [
+            <span
+              className="tooltip-label-item"
+              key={`description-${path.join('/')}`}
+            >
+              {friendlyName}
+            </span>,
+            curve,
+          ]),
         };
       }
 
@@ -118,6 +179,15 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
           </span>,
           curve,
         ]),
+        description: t('permission_manageBip32KeysDescription', [
+          <span
+            className="tooltip-label-item"
+            key={`description-${path.join('/')}`}
+          >
+            {path.join('/')}
+          </span>,
+          curve,
+        ]),
       };
     }),
   [RestrictedMethods.snap_getBip44Entropy]: (t, _, permissionValue) =>
@@ -125,31 +195,43 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
       label: t('permission_manageBip44Keys', [
         <span className="permission-label-item" key={`coin-type-${coinType}`}>
           {coinTypeToProtocolName(coinType) ||
-            `${coinType} (Unrecognized protocol)`}
+            t('unrecognizedProtocol', [coinType])}
         </span>,
       ]),
-      leftIcon: 'fas fa-door-open',
-      rightIcon: null,
+      description: t('permission_manageBip44KeysDescription', [
+        <span
+          className="tooltip-label-item"
+          key={`description-coin-type-${coinType}`}
+        >
+          {coinTypeToProtocolName(coinType) ||
+            t('unrecognizedProtocol', [coinType])}
+        </span>,
+      ]),
+      leftIcon: getLeftIcon(ICON_NAMES.KEY),
+      rightIcon: RIGHT_WARNING_ICON,
       weight: 1,
     })),
   [RestrictedMethods.snap_getEntropy]: (t) => ({
     label: t('permission_getEntropy'),
-    leftIcon: 'fas fa-key',
-    rightIcon: null,
+    description: t('permission_getEntropyDescription'),
+    leftIcon: getLeftIcon(ICON_NAMES.SECURITY_KEY),
+    rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
   [RestrictedMethods.snap_manageState]: (t) => ({
     label: t('permission_manageState'),
-    leftIcon: 'fas fa-download',
-    rightIcon: null,
+    description: t('permission_manageStateDescription'),
+    leftIcon: getLeftIcon(ICON_NAMES.ADD_SQUARE),
+    rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
   [RestrictedMethods.wallet_snap]: (t, _, permissionValue) => {
     const snaps = permissionValue.caveats[0].value;
     const baseDescription = {
-      leftIcon: 'fas fa-bolt',
-      rightIcon: null,
+      leftIcon: getLeftIcon(ICON_NAMES.FLASH),
+      rightIcon: RIGHT_INFO_ICON,
     };
+
     return Object.keys(snaps).map((snapId) => {
       const friendlyName = getSnapName(snapId);
       if (friendlyName) {
@@ -160,30 +242,36 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
               {friendlyName}
             </span>,
           ]),
+          description: t('permission_accessSnapDescription', [friendlyName]),
         };
       }
+
       return {
         ...baseDescription,
         label: t('permission_accessSnap', [snapId]),
+        description: t('permission_accessSnapDescription', [snapId]),
       };
     });
   },
   [EndowmentPermissions['endowment:network-access']]: (t) => ({
     label: t('permission_accessNetwork'),
-    leftIcon: 'fas fa-wifi',
-    rightIcon: null,
+    description: t('permission_accessNetworkDescription'),
+    leftIcon: getLeftIcon(ICON_NAMES.GLOBAL),
+    rightIcon: RIGHT_INFO_ICON,
     weight: 2,
   }),
   [EndowmentPermissions['endowment:webassembly']]: (t) => ({
     label: t('permission_webAssembly'),
+    description: t('permission_webAssemblyDescription'),
     leftIcon: 'fas fa-microchip',
     rightIcon: null,
     weight: 2,
   }),
   [EndowmentPermissions['endowment:long-running']]: (t) => ({
     label: t('permission_longRunning'),
-    leftIcon: 'fas fa-infinity',
-    rightIcon: null,
+    description: t('permission_longRunningDescription'),
+    leftIcon: getLeftIcon(ICON_NAMES.LINK),
+    rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
   [EndowmentPermissions['endowment:transaction-insight']]: (
@@ -192,14 +280,16 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
     permissionValue,
   ) => {
     const baseDescription = {
-      leftIcon: 'fas fa-info',
-      rightIcon: null,
+      leftIcon: getLeftIcon(ICON_NAMES.SPEEDOMETER),
+      rightIcon: RIGHT_INFO_ICON,
+      weight: 3,
     };
 
     const result = [
       {
         ...baseDescription,
         label: t('permission_transactionInsight'),
+        description: t('permission_transactionInsightDescription'),
       },
     ];
 
@@ -211,7 +301,8 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
       result.push({
         ...baseDescription,
         label: t('permission_transactionInsightOrigin'),
-        leftIcon: 'fas fa-compass',
+        description: t('permission_transactionInsightOriginDescription'),
+        leftIcon: getLeftIcon(ICON_NAMES.EXPLORE),
       });
     }
 
@@ -219,39 +310,50 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
   },
   [EndowmentPermissions['endowment:cronjob']]: (t) => ({
     label: t('permission_cronjob'),
-    leftIcon: 'fas fa-clock',
-    rightIcon: null,
+    description: t('permission_cronjobDescription'),
+    leftIcon: getLeftIcon(ICON_NAMES.CLOCK),
+    rightIcon: RIGHT_INFO_ICON,
     weight: 2,
   }),
   [EndowmentPermissions['endowment:ethereum-provider']]: (t) => ({
     label: t('permission_ethereumProvider'),
-    leftIcon: 'fab fa-ethereum',
-    rightIcon: null,
+    description: t('permission_ethereumProviderDescription'),
+    leftIcon: getLeftIcon(ICON_NAMES.ETHEREUM),
+    rightIcon: RIGHT_INFO_ICON,
     weight: 1,
   }),
   [EndowmentPermissions['endowment:rpc']]: (t, _, permissionValue) => {
+    const baseDescription = {
+      leftIcon: getLeftIcon(ICON_NAMES.HIERARCHY),
+      rightIcon: RIGHT_INFO_ICON,
+      weight: 2,
+    };
+
     const { snaps, dapps } = getRpcCaveatOrigins(permissionValue);
 
-    const labels = [];
+    const results = [];
     if (snaps) {
-      labels.push(t('permission_rpc', [t('otherSnaps')]));
+      results.push({
+        ...baseDescription,
+        label: t('permission_rpc', [t('otherSnaps')]),
+        description: t('permission_rpcDescription', [t('otherSnaps')]),
+      });
     }
 
     if (dapps) {
-      labels.push(t('permission_rpc', [t('websites')]));
+      results.push({
+        ...baseDescription,
+        label: t('permission_rpc', [t('websites')]),
+        description: t('permission_rpcDescription', [t('websites')]),
+      });
     }
 
-    return labels.map((label) => ({
-      label,
-      leftIcon: 'fas fa-plug',
-      rightIcon: null,
-      weight: 2,
-    }));
+    return results;
   },
   ///: END:ONLY_INCLUDE_IN
   [UNKNOWN_PERMISSION]: (t, permissionName) => ({
     label: t('permission_unknown', [permissionName ?? 'undefined']),
-    leftIcon: 'fas fa-times-circle',
+    leftIcon: getLeftIcon(ICON_NAMES.QUESTION),
     rightIcon: null,
     weight: 4,
   }),
@@ -260,6 +362,8 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
 /**
  * @typedef {object} PermissionLabelObject
  * @property {string} label - The text label.
+ * @property {string} [description] - An optional description, shown when the
+ * `rightIcon` is hovered.
  * @property {string} leftIcon - The left icon.
  * @property {string} rightIcon - The right icon.
  * @property {number} weight - The weight of the permission.
@@ -315,3 +419,50 @@ export function getWeightedPermissions(t, permissions) {
     )
     .sort((left, right) => left.weight - right.weight);
 }
+
+/**
+ * Get the right icon for a permission. If a description is provided, the icon
+ * will be wrapped in a tooltip. Otherwise, the icon will be rendered as-is. If
+ * there's no right icon, this function will return null.
+ *
+ * If the weight is 1, the icon will be rendered with a warning color.
+ *
+ * @param {PermissionLabelObject} permission - The permission object.
+ * @param {JSX.Element | string} permission.rightIcon - The right icon.
+ * @param {string} permission.description - The description.
+ * @param {number} permission.weight - The weight.
+ * @returns {JSX.Element | null} The right icon, or null if there's no
+ * right icon.
+ */
+export function getRightIcon({ rightIcon, description, weight }) {
+  if (rightIcon && description) {
+    return (
+      <Tooltip
+        wrapperClassName={classnames(
+          'permission__tooltip-icon',
+          weight === 1 && 'permission__tooltip-icon__warning',
+        )}
+        html={<div>{description}</div>}
+        position="bottom"
+      >
+        {typeof rightIcon === 'string' ? (
+          <i className={rightIcon} />
+        ) : (
+          rightIcon
+        )}
+      </Tooltip>
+    );
+  }
+
+  if (rightIcon) {
+    if (typeof rightIcon === 'string') {
+      return (
+        <i className={classnames(rightIcon, 'permission__tooltip-icon')} />
+      );
+    }
+
+    return rightIcon;
+  }
+
+  return null;
+}

From 033b776c0ed59d59a6ca7161b64daa5f76b2e461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Mon, 20 Mar 2023 11:55:53 +0000
Subject: [PATCH 027/129] [MMI] adds the jwt-url-form component (#18198)

* MMI adds the Jwt dropdown

* MMI prettier

* review fixes

* adds the component

* adds tests and story file

* lint & prettier fix

* prettier fix

* prettier and clean up

* prettier and clean up
---
 app/_locales/en/messages.json                 |  11 +-
 .../__snapshots__/jwt-url-form.test.js.snap   |  46 +++++++
 .../institutional/jwt-url-form/index.js       |   1 +
 .../jwt-url-form/jwt-url-form.js              | 128 ++++++++++++++++++
 .../jwt-url-form/jwt-url-form.scss            |  58 ++++++++
 .../jwt-url-form/jwt-url-form.stories.js      |  24 ++++
 .../jwt-url-form/jwt-url-form.test.js         |  77 +++++++++++
 7 files changed, 344 insertions(+), 1 deletion(-)
 create mode 100644 ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap
 create mode 100644 ui/components/institutional/jwt-url-form/index.js
 create mode 100644 ui/components/institutional/jwt-url-form/jwt-url-form.js
 create mode 100644 ui/components/institutional/jwt-url-form/jwt-url-form.scss
 create mode 100644 ui/components/institutional/jwt-url-form/jwt-url-form.stories.js
 create mode 100644 ui/components/institutional/jwt-url-form/jwt-url-form.test.js

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 733e0edc8..eefe50cb5 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -257,6 +257,9 @@
     "message": "This network connection relies on third parties. This connection may be less reliable or enable third-parties to track activity. $1",
     "description": "$1 is Learn more link"
   },
+  "addNewToken": {
+    "message": "Add new token"
+  },
   "addSuggestedTokens": {
     "message": "Add suggested tokens"
   },
@@ -1370,6 +1373,9 @@
     "message": "File import not working? Click here!",
     "description": "Helps user import their account from a JSON file"
   },
+  "fileTooBig": {
+    "message": "The dropped file is too big."
+  },
   "flaskSnapSettingsCardButtonCta": {
     "message": "See details",
     "description": "Call to action a user can take to see more information about the snap that is installed"
@@ -3331,6 +3337,9 @@
   "selectHdPath": {
     "message": "Select HD path"
   },
+  "selectJWT": {
+    "message": "Select token"
+  },
   "selectNFTPrivacyPreference": {
     "message": "Turn on NFT detection in Settings"
   },
@@ -4003,7 +4012,7 @@
     "message": "Select a quote"
   },
   "swapSelectAToken": {
-    "message": "Select a token"
+    "message": "Select token"
   },
   "swapSelectQuotePopoverDescription": {
     "message": "Below are all the quotes gathered from multiple liquidity sources."
diff --git a/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap b/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap
new file mode 100644
index 000000000..2d9c15b48
--- /dev/null
+++ b/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap
@@ -0,0 +1,46 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`JwtUrlForm shows JWT text area when no jwt token exists 1`] = `
+<div>
+  <div
+    class="box jwt-url-form box--margin-bottom-8 box--display-flex box--flex-direction-row box--align-items-flex-start"
+  >
+    <div
+      class="box jwt-url-form__jwt-container box--margin-bottom-6 box--flex-direction-row"
+    >
+      <div
+        class="box box--flex-direction-row"
+      >
+        <p
+          class="box mm-text jwt-url-form__instruction mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+        >
+          input text
+        </p>
+        <textarea
+          bordercolor="border-default"
+          class="jwt-url-form__input-jwt"
+          data-testid="jwt-input"
+          id="jwt-box"
+        />
+      </div>
+    </div>
+    <div
+      class="box jwt-url-form__jwt-apiUrlInput box--flex-direction-row"
+    >
+      <p
+        class="box mm-text jwt-url-form__instruction mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+      />
+      <div
+        class="box box--flex-direction-row"
+      >
+        <input
+          class="jwt-url-form__input"
+          data-testid="jwt-api-url-input"
+          id="api-url-box"
+          value="url"
+        />
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/institutional/jwt-url-form/index.js b/ui/components/institutional/jwt-url-form/index.js
new file mode 100644
index 000000000..f3e07ae84
--- /dev/null
+++ b/ui/components/institutional/jwt-url-form/index.js
@@ -0,0 +1 @@
+export { default } from './jwt-url-form';
diff --git a/ui/components/institutional/jwt-url-form/jwt-url-form.js b/ui/components/institutional/jwt-url-form/jwt-url-form.js
new file mode 100644
index 000000000..c1c9f3edf
--- /dev/null
+++ b/ui/components/institutional/jwt-url-form/jwt-url-form.js
@@ -0,0 +1,128 @@
+import React, { useState, useRef } from 'react';
+import PropTypes from 'prop-types';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  AlignItems,
+  DISPLAY,
+  BorderColor,
+} from '../../../helpers/constants/design-system';
+import { Text } from '../../component-library';
+import JwtDropdown from '../jwt-dropdown';
+import Button from '../../ui/button';
+import Box from '../../ui/box';
+
+const JwtUrlForm = (props) => {
+  const t = useI18nContext();
+  const inputRef = useRef();
+  const [addNewTokenClicked, setAddNewTokenClicked] = useState(false);
+  const [fileTooBigError, setFileTooBigError] = useState();
+
+  const renderJWTInput = () => {
+    const showAddNewToken = addNewTokenClicked;
+    const showJwtDropdown = props.jwtList.length >= 1;
+
+    return (
+      <Box className="jwt-url-form__jwt-container" marginBottom={6}>
+        {showJwtDropdown && (
+          <JwtDropdown
+            data-testid="jwt-dropdown"
+            currentJwt={props.currentJwt ? props.currentJwt : props.jwtList[0]}
+            jwtList={props.jwtList}
+            onChange={(value) => {
+              props.onJwtChange(value);
+              setFileTooBigError(false);
+            }}
+          />
+        )}
+        {showJwtDropdown && !showAddNewToken && (
+          <Box
+            className="jwt-url-form__btn__container"
+            display={DISPLAY.FLEX}
+            alignItems={AlignItems.center}
+            marginTop={2}
+          >
+            <Text>{t('or')}</Text>
+            <Button
+              type="secondary"
+              medium="true"
+              onClick={() => {
+                props.onJwtChange('');
+                setAddNewTokenClicked(true);
+              }}
+            >
+              <Text>{t('addNewToken')}</Text>
+            </Button>
+          </Box>
+        )}
+        {(!showJwtDropdown || showAddNewToken) && (
+          <Box>
+            <Text className="jwt-url-form__instruction">
+              {props.jwtInputText}
+            </Text>
+            {fileTooBigError && (
+              <span className="error">
+                <Text>{t('fileTooBig')}</Text>
+              </span>
+            )}
+            <textarea
+              className="jwt-url-form__input-jwt"
+              data-testid="jwt-input"
+              borderColor={BorderColor.borderDefault}
+              id="jwt-box"
+              onChange={(e) => {
+                props.onJwtChange(e.target.value);
+                setFileTooBigError(false);
+              }}
+              ref={inputRef.current}
+              value={props.currentJwt}
+              autoFocus
+            />
+          </Box>
+        )}
+      </Box>
+    );
+  };
+
+  const renderAPIURLInput = () => {
+    return (
+      <Box className="jwt-url-form__jwt-apiUrlInput">
+        <Text className="jwt-url-form__instruction">{props.urlInputText}</Text>
+        <Box>
+          <input
+            className="jwt-url-form__input"
+            id="api-url-box"
+            data-testid="jwt-api-url-input"
+            onChange={(e) => {
+              props.onUrlChange(e.target.value);
+            }}
+            value={props.apiUrl}
+          />
+        </Box>
+      </Box>
+    );
+  };
+
+  return (
+    <Box
+      className="jwt-url-form"
+      display={DISPLAY.FLEX}
+      alignItems={AlignItems.flexStart}
+      marginBottom={8}
+    >
+      {renderJWTInput()}
+      {renderAPIURLInput()}
+    </Box>
+  );
+};
+
+JwtUrlForm.propTypes = {
+  jwtList: PropTypes.array,
+  currentJwt: PropTypes.string,
+  onJwtChange: PropTypes.func,
+  jwtInputText: PropTypes.string,
+  apiUrl: PropTypes.string,
+  urlInputText: PropTypes.string,
+  onUrlChange: PropTypes.func,
+};
+
+export default JwtUrlForm;
diff --git a/ui/components/institutional/jwt-url-form/jwt-url-form.scss b/ui/components/institutional/jwt-url-form/jwt-url-form.scss
new file mode 100644
index 000000000..cb235473d
--- /dev/null
+++ b/ui/components/institutional/jwt-url-form/jwt-url-form.scss
@@ -0,0 +1,58 @@
+.jwt-url-form {
+  flex-flow: column;
+
+  &__jwt-container {
+    width: 100%;
+  }
+
+  &__jwt-apiUrlInput {
+    width: 100%;
+  }
+
+  &__btn__container {
+    flex-flow: column;
+    width: 100%;
+
+    & > span {
+      padding-bottom: 10px;
+    }
+  }
+
+  &__instruction {
+    @include Paragraph;
+
+    align-self: flex-start;
+    display: block;
+    font-size: 14px;
+  }
+
+  &__input {
+    @include Paragraph;
+
+    height: 54px;
+    width: 100%;
+    border-radius: 4px;
+    background-color: var(--color-background-default);
+    margin-top: 16px;
+    padding: 0 10px;
+  }
+
+  &__input-jwt-container {
+    display: flex;
+    flex-flow: column;
+    align-items: center;
+    width: 100%;
+    margin-top: 16px;
+  }
+
+  &__input-jwt {
+    @include Paragraph;
+
+    height: 154px;
+    width: 100%;
+    border-radius: 4px;
+    background-color: var(--color-background-default);
+    color: var(--color-text-default);
+    padding: 10px;
+  }
+}
diff --git a/ui/components/institutional/jwt-url-form/jwt-url-form.stories.js b/ui/components/institutional/jwt-url-form/jwt-url-form.stories.js
new file mode 100644
index 000000000..0fee65dbe
--- /dev/null
+++ b/ui/components/institutional/jwt-url-form/jwt-url-form.stories.js
@@ -0,0 +1,24 @@
+import React from 'react';
+import JwtUrlForm from '.';
+
+export default {
+  title: 'Components/Institutional/JwtUrlForm',
+  component: JwtUrlForm,
+  args: {
+    jwtList: ['jwt1', 'jwt2', 'jwt3'],
+    currentJwt: 'jwt1',
+    urlInputText: 'url',
+    apiUrl: 'https://apiurl.io/v1',
+    jwtInputText: 'some input text',
+    onJwtChange: () => {
+      /**/
+    },
+    onUrlChange: () => {
+      /**/
+    },
+  },
+};
+
+export const DefaultStory = (args) => <JwtUrlForm {...args} />;
+
+DefaultStory.storyName = 'JwtUrlForm';
diff --git a/ui/components/institutional/jwt-url-form/jwt-url-form.test.js b/ui/components/institutional/jwt-url-form/jwt-url-form.test.js
new file mode 100644
index 000000000..5452b9fd9
--- /dev/null
+++ b/ui/components/institutional/jwt-url-form/jwt-url-form.test.js
@@ -0,0 +1,77 @@
+import React from 'react';
+import sinon from 'sinon';
+import { fireEvent, screen } from '@testing-library/react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import JwtUrlForm from './jwt-url-form';
+
+describe('JwtUrlForm', function () {
+  const mockStore = {
+    metamask: {
+      provider: {
+        type: 'test',
+      },
+    },
+  };
+
+  const store = configureMockStore()(mockStore);
+
+  const props = {
+    jwtList: ['jwt1'],
+    currentJwt: 'jwt1',
+    onJwtChange: sinon.spy(),
+    jwtInputText: 'input text',
+    apiUrl: 'url',
+    urlInputText: '',
+    onUrlChange: sinon.spy(),
+  };
+
+  it('opens JWT Url Form without input for new JWT', () => {
+    const { container, getByText } = renderWithProvider(
+      <JwtUrlForm {...props} />,
+      store,
+    );
+
+    const btn = container.querySelector(
+      '.jwt-url-form__btn__container .btn-secondary',
+    );
+    expect(btn).toHaveClass('button');
+    expect(getByText('Add new token')).toBeInTheDocument();
+  });
+
+  it('shows JWT textarea with provided input text', () => {
+    const { container } = renderWithProvider(<JwtUrlForm {...props} />, store);
+
+    const btn = container.querySelector(
+      '.jwt-url-form__btn__container .btn-secondary',
+    );
+    fireEvent.click(btn);
+    expect(screen.getByText('input text')).toBeInTheDocument();
+  });
+
+  it('goes through the api url input', () => {
+    const { queryByTestId } = renderWithProvider(
+      <JwtUrlForm {...props} />,
+      store,
+    );
+
+    const apiUrlinput = queryByTestId('jwt-api-url-input');
+    fireEvent.change(apiUrlinput, { target: { value: 'url' } });
+    expect(apiUrlinput.value).toBe('url');
+  });
+
+  it('shows JWT text area when no jwt token exists', () => {
+    const customProps = {
+      ...props,
+      currentJwt: '',
+      jwtList: [],
+    };
+
+    const { container } = renderWithProvider(
+      <JwtUrlForm {...customProps} />,
+      store,
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+});

From bf299224885672bbe01756c17657fcf78d9598a5 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Mon, 20 Mar 2023 13:19:50 +0000
Subject: [PATCH 028/129] Use core message managers and create sign controller
 (#18163)

---
 app/scripts/background.js                     |  41 +-
 app/scripts/controllers/sign.test.ts          | 609 ++++++++++++++++
 app/scripts/controllers/sign.ts               | 658 ++++++++++++++++++
 app/scripts/lib/message-manager.js            | 329 ---------
 app/scripts/lib/message-manager.test.js       | 128 ----
 app/scripts/lib/typed-message-manager.js      | 421 -----------
 app/scripts/lib/typed-message-manager.test.js | 126 ----
 app/scripts/metamask-controller.js            | 308 ++------
 app/scripts/metamask-controller.test.js       | 171 -----
 jest.config.js                                |   2 +
 lavamoat/browserify/beta/policy.json          |  41 +-
 lavamoat/browserify/desktop/policy.json       |  41 +-
 lavamoat/browserify/flask/policy.json         |  41 +-
 lavamoat/browserify/main/policy.json          |  41 +-
 package.json                                  |   2 +-
 types/eth-keyring-controller.d.ts             |   9 +
 ui/store/actions.test.js                      |   4 +
 yarn.lock                                     |  17 +-
 18 files changed, 1496 insertions(+), 1493 deletions(-)
 create mode 100644 app/scripts/controllers/sign.test.ts
 create mode 100644 app/scripts/controllers/sign.ts
 delete mode 100644 app/scripts/lib/message-manager.js
 delete mode 100644 app/scripts/lib/message-manager.test.js
 delete mode 100644 app/scripts/lib/typed-message-manager.js
 delete mode 100644 app/scripts/lib/typed-message-manager.test.js
 create mode 100644 types/eth-keyring-controller.d.ts

diff --git a/app/scripts/background.js b/app/scripts/background.js
index b6d51f657..d36376e20 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -656,14 +656,6 @@ export function setupController(initState, initLangCode, overrides) {
     METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
     updateBadge,
   );
-  controller.messageManager.on(
-    METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
-    updateBadge,
-  );
-  controller.personalMessageManager.on(
-    METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
-    updateBadge,
-  );
   controller.decryptMessageManager.on(
     METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
     updateBadge,
@@ -672,7 +664,7 @@ export function setupController(initState, initLangCode, overrides) {
     METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
     updateBadge,
   );
-  controller.typedMessageManager.on(
+  controller.signController.hub.on(
     METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE,
     updateBadge,
   );
@@ -708,23 +700,17 @@ export function setupController(initState, initLangCode, overrides) {
 
   function getUnapprovedTransactionCount() {
     const unapprovedTxCount = controller.txController.getUnapprovedTxCount();
-    const { unapprovedMsgCount } = controller.messageManager;
-    const { unapprovedPersonalMsgCount } = controller.personalMessageManager;
     const { unapprovedDecryptMsgCount } = controller.decryptMessageManager;
     const { unapprovedEncryptionPublicKeyMsgCount } =
       controller.encryptionPublicKeyManager;
-    const { unapprovedTypedMessagesCount } = controller.typedMessageManager;
     const pendingApprovalCount =
       controller.approvalController.getTotalApprovalCount();
     const waitingForUnlockCount =
       controller.appStateController.waitingForUnlock.length;
     return (
       unapprovedTxCount +
-      unapprovedMsgCount +
-      unapprovedPersonalMsgCount +
       unapprovedDecryptMsgCount +
       unapprovedEncryptionPublicKeyMsgCount +
-      unapprovedTypedMessagesCount +
       pendingApprovalCount +
       waitingForUnlockCount
     );
@@ -747,30 +733,7 @@ export function setupController(initState, initLangCode, overrides) {
     ).forEach((txId) =>
       controller.txController.txStateManager.setTxStatusRejected(txId),
     );
-    controller.messageManager.messages
-      .filter((msg) => msg.status === 'unapproved')
-      .forEach((tx) =>
-        controller.messageManager.rejectMsg(
-          tx.id,
-          REJECT_NOTFICIATION_CLOSE_SIG,
-        ),
-      );
-    controller.personalMessageManager.messages
-      .filter((msg) => msg.status === 'unapproved')
-      .forEach((tx) =>
-        controller.personalMessageManager.rejectMsg(
-          tx.id,
-          REJECT_NOTFICIATION_CLOSE_SIG,
-        ),
-      );
-    controller.typedMessageManager.messages
-      .filter((msg) => msg.status === 'unapproved')
-      .forEach((tx) =>
-        controller.typedMessageManager.rejectMsg(
-          tx.id,
-          REJECT_NOTFICIATION_CLOSE_SIG,
-        ),
-      );
+    controller.signController.rejectUnapproved(REJECT_NOTFICIATION_CLOSE_SIG);
     controller.decryptMessageManager.messages
       .filter((msg) => msg.status === 'unapproved')
       .forEach((tx) =>
diff --git a/app/scripts/controllers/sign.test.ts b/app/scripts/controllers/sign.test.ts
new file mode 100644
index 000000000..9363583fb
--- /dev/null
+++ b/app/scripts/controllers/sign.test.ts
@@ -0,0 +1,609 @@
+import {
+  MessageManager,
+  PersonalMessageManager,
+  TypedMessageManager,
+} from '@metamask/message-manager';
+import {
+  AbstractMessage,
+  OriginalRequest,
+} from '@metamask/message-manager/dist/AbstractMessageManager';
+import { EVENT } from '../../../shared/constants/metametrics';
+import { detectSIWE } from '../../../shared/modules/siwe';
+import SignController, {
+  SignControllerMessenger,
+  SignControllerOptions,
+} from './sign';
+
+jest.mock('@metamask/message-manager', () => ({
+  MessageManager: jest.fn(),
+  PersonalMessageManager: jest.fn(),
+  TypedMessageManager: jest.fn(),
+}));
+
+jest.mock('../../../shared/modules/siwe', () => ({
+  detectSIWE: jest.fn(),
+}));
+
+const messageIdMock = '123';
+const messageIdMock2 = '456';
+const versionMock = '1';
+const signatureMock = '0xAABBCC';
+const stateMock = { test: 123 };
+const securityProviderResponseMock = { test2: 345 };
+
+const messageParamsMock = {
+  from: '0x123',
+  origin: 'http://test.com',
+  data: '0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
+  metamaskId: messageIdMock,
+  version: 'V1',
+};
+
+const messageParamsMock2 = {
+  from: '0x124',
+  origin: 'http://test4.com',
+  data: '0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA',
+  metamaskId: messageIdMock,
+};
+
+const messageMock = {
+  id: messageIdMock,
+  time: 123,
+  status: 'unapproved',
+  type: 'testType',
+  rawSig: undefined,
+} as any as AbstractMessage;
+
+const coreMessageMock = {
+  ...messageMock,
+  messageParams: messageParamsMock,
+};
+
+const stateMessageMock = {
+  ...messageMock,
+  msgParams: messageParamsMock,
+  securityProviderResponse: securityProviderResponseMock,
+};
+
+const requestMock = {
+  origin: 'http://test2.com',
+} as OriginalRequest;
+
+const siweMockFound = {
+  isSIWEMessage: true,
+  parsedMessage: { domain: 'test.com', test: 'value' },
+};
+
+const siweMockNotFound = { isSIWEMessage: false };
+
+const createMessengerMock = () =>
+  ({
+    registerActionHandler: jest.fn(),
+    publish: jest.fn(),
+    call: jest.fn(),
+  } as any as jest.Mocked<SignControllerMessenger>);
+
+const createMessageManagerMock = <T>() =>
+  ({
+    getUnapprovedMessages: jest.fn(),
+    getUnapprovedMessagesCount: jest.fn(),
+    addUnapprovedMessageAsync: jest.fn(),
+    approveMessage: jest.fn(),
+    setMessageStatusSigned: jest.fn(),
+    rejectMessage: jest.fn(),
+    subscribe: jest.fn(),
+    update: jest.fn(),
+    hub: {
+      on: jest.fn(),
+    },
+  } as any as jest.Mocked<T>);
+
+const createPreferencesControllerMock = () => ({
+  store: {
+    getState: jest.fn(),
+  },
+});
+
+const createKeyringControllerMock = () => ({
+  signMessage: jest.fn(),
+  signPersonalMessage: jest.fn(),
+  signTypedMessage: jest.fn(),
+});
+
+describe('SignController', () => {
+  let signController: SignController;
+
+  const messageManagerConstructorMock = MessageManager as jest.MockedClass<
+    typeof MessageManager
+  >;
+  const personalMessageManagerConstructorMock =
+    PersonalMessageManager as jest.MockedClass<typeof PersonalMessageManager>;
+  const typedMessageManagerConstructorMock =
+    TypedMessageManager as jest.MockedClass<typeof TypedMessageManager>;
+  const messageManagerMock = createMessageManagerMock<MessageManager>();
+  const personalMessageManagerMock =
+    createMessageManagerMock<PersonalMessageManager>();
+  const typedMessageManagerMock =
+    createMessageManagerMock<TypedMessageManager>();
+  const messengerMock = createMessengerMock();
+  const preferencesControllerMock = createPreferencesControllerMock();
+  const keyringControllerMock = createKeyringControllerMock();
+  const detectSIWEMock = detectSIWE as jest.MockedFunction<typeof detectSIWE>;
+  const getStateMock = jest.fn();
+  const securityProviderRequestMock = jest.fn();
+  const metricsEventMock = jest.fn();
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    messageManagerConstructorMock.mockReturnValue(messageManagerMock);
+    personalMessageManagerConstructorMock.mockReturnValue(
+      personalMessageManagerMock,
+    );
+
+    typedMessageManagerConstructorMock.mockReturnValue(typedMessageManagerMock);
+
+    preferencesControllerMock.store.getState.mockReturnValue({
+      disabledRpcMethodPreferences: { eth_sign: true },
+    });
+
+    detectSIWEMock.mockReturnValue(siweMockNotFound);
+
+    signController = new SignController({
+      messenger: messengerMock as any,
+      preferencesController: preferencesControllerMock as any,
+      keyringController: keyringControllerMock as any,
+      getState: getStateMock as any,
+      securityProviderRequest: securityProviderRequestMock as any,
+      metricsEvent: metricsEventMock as any,
+    } as SignControllerOptions);
+  });
+
+  describe('unapprovedMsgCount', () => {
+    it('returns value from message manager getter', () => {
+      messageManagerMock.getUnapprovedMessagesCount.mockReturnValueOnce(10);
+      expect(signController.unapprovedMsgCount).toBe(10);
+    });
+  });
+
+  describe('unapprovedPersonalMessagesCount', () => {
+    it('returns value from personal message manager getter', () => {
+      personalMessageManagerMock.getUnapprovedMessagesCount.mockReturnValueOnce(
+        11,
+      );
+      expect(signController.unapprovedPersonalMessagesCount).toBe(11);
+    });
+  });
+
+  describe('unapprovedTypedMessagesCount', () => {
+    it('returns value from typed message manager getter', () => {
+      typedMessageManagerMock.getUnapprovedMessagesCount.mockReturnValueOnce(
+        12,
+      );
+      expect(signController.unapprovedTypedMessagesCount).toBe(12);
+    });
+  });
+
+  describe('resetState', () => {
+    it('sets state to initial state', () => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      signController.update(() => ({
+        unapprovedMsgs: { [messageIdMock]: messageMock } as any,
+        unapprovedPersonalMsgs: { [messageIdMock]: messageMock } as any,
+        unapprovedTypedMessages: { [messageIdMock]: messageMock } as any,
+        unapprovedMsgCount: 1,
+        unapprovedPersonalMsgCount: 2,
+        unapprovedTypedMessagesCount: 3,
+      }));
+
+      signController.resetState();
+
+      expect(signController.state).toEqual({
+        unapprovedMsgs: {},
+        unapprovedPersonalMsgs: {},
+        unapprovedTypedMessages: {},
+        unapprovedMsgCount: 0,
+        unapprovedPersonalMsgCount: 0,
+        unapprovedTypedMessagesCount: 0,
+      });
+    });
+  });
+
+  describe('rejectUnapproved', () => {
+    beforeEach(() => {
+      const messages = {
+        [messageIdMock]: messageMock,
+        [messageIdMock2]: messageMock,
+      };
+
+      messageManagerMock.getUnapprovedMessages.mockReturnValueOnce(
+        messages as any,
+      );
+      personalMessageManagerMock.getUnapprovedMessages.mockReturnValueOnce(
+        messages as any,
+      );
+      typedMessageManagerMock.getUnapprovedMessages.mockReturnValueOnce(
+        messages as any,
+      );
+
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      signController.update(() => ({
+        unapprovedMsgs: messages as any,
+        unapprovedPersonalMsgs: messages as any,
+        unapprovedTypedMessages: messages as any,
+      }));
+    });
+
+    it('rejects all messages in all message managers', () => {
+      signController.rejectUnapproved('Test Reason');
+
+      expect(messageManagerMock.rejectMessage).toHaveBeenCalledTimes(2);
+      expect(messageManagerMock.rejectMessage).toHaveBeenCalledWith(
+        messageIdMock,
+      );
+      expect(messageManagerMock.rejectMessage).toHaveBeenCalledWith(
+        messageIdMock2,
+      );
+
+      expect(personalMessageManagerMock.rejectMessage).toHaveBeenCalledTimes(2);
+      expect(personalMessageManagerMock.rejectMessage).toHaveBeenCalledWith(
+        messageIdMock,
+      );
+      expect(personalMessageManagerMock.rejectMessage).toHaveBeenCalledWith(
+        messageIdMock2,
+      );
+
+      expect(typedMessageManagerMock.rejectMessage).toHaveBeenCalledTimes(2);
+      expect(typedMessageManagerMock.rejectMessage).toHaveBeenCalledWith(
+        messageIdMock,
+      );
+      expect(typedMessageManagerMock.rejectMessage).toHaveBeenCalledWith(
+        messageIdMock2,
+      );
+    });
+
+    it('fires metrics event with reject reason', () => {
+      signController.rejectUnapproved('Test Reason');
+
+      expect(metricsEventMock).toHaveBeenCalledTimes(6);
+      expect(metricsEventMock).toHaveBeenLastCalledWith({
+        event: 'Test Reason',
+        category: EVENT.CATEGORIES.TRANSACTIONS,
+        properties: {
+          action: 'Sign Request',
+          type: messageMock.type,
+        },
+      });
+    });
+  });
+
+  describe('clearUnapproved', () => {
+    it('resets state in all message managers', () => {
+      signController.clearUnapproved();
+
+      const defaultState = {
+        unapprovedMessages: {},
+        unapprovedMessagesCount: 0,
+      };
+
+      expect(messageManagerMock.update).toHaveBeenCalledTimes(1);
+      expect(messageManagerMock.update).toHaveBeenCalledWith(defaultState);
+
+      expect(personalMessageManagerMock.update).toHaveBeenCalledTimes(1);
+      expect(personalMessageManagerMock.update).toHaveBeenCalledWith(
+        defaultState,
+      );
+
+      expect(typedMessageManagerMock.update).toHaveBeenCalledTimes(1);
+      expect(typedMessageManagerMock.update).toHaveBeenCalledWith(defaultState);
+    });
+  });
+
+  describe('newUnsignedMessage', () => {
+    it('throws if eth_sign disabled in preferences', async () => {
+      preferencesControllerMock.store.getState.mockReturnValueOnce({
+        disabledRpcMethodPreferences: { eth_sign: false },
+      });
+
+      await expect(
+        signController.newUnsignedMessage(messageParamsMock, requestMock),
+      ).rejects.toThrowError(
+        'eth_sign has been disabled. You must enable it in the advanced settings',
+      );
+    });
+
+    it('throws if data has wrong length', async () => {
+      await expect(
+        signController.newUnsignedMessage(
+          { ...messageParamsMock, data: '0xFF' },
+          requestMock,
+        ),
+      ).rejects.toThrowError('eth_sign requires 32 byte message hash');
+    });
+
+    it('adds message to message manager', async () => {
+      await signController.newUnsignedMessage(messageParamsMock, requestMock);
+
+      expect(
+        messageManagerMock.addUnapprovedMessageAsync,
+      ).toHaveBeenCalledTimes(1);
+      expect(messageManagerMock.addUnapprovedMessageAsync).toHaveBeenCalledWith(
+        messageParamsMock,
+        requestMock,
+      );
+    });
+  });
+
+  describe('newUnsignedPersonalMessage', () => {
+    it('adds message to personal message manager', async () => {
+      await signController.newUnsignedPersonalMessage(
+        messageParamsMock,
+        requestMock,
+      );
+
+      expect(
+        personalMessageManagerMock.addUnapprovedMessageAsync,
+      ).toHaveBeenCalledTimes(1);
+
+      expect(
+        personalMessageManagerMock.addUnapprovedMessageAsync,
+      ).toHaveBeenCalledWith(
+        expect.objectContaining(messageParamsMock),
+        requestMock,
+      );
+    });
+
+    it('adds message to personal message manager including Ethereum sign in data', async () => {
+      detectSIWEMock.mockReturnValueOnce(siweMockFound);
+
+      await signController.newUnsignedPersonalMessage(
+        messageParamsMock,
+        requestMock,
+      );
+
+      expect(
+        personalMessageManagerMock.addUnapprovedMessageAsync,
+      ).toHaveBeenCalledTimes(1);
+
+      expect(
+        personalMessageManagerMock.addUnapprovedMessageAsync,
+      ).toHaveBeenCalledWith(
+        {
+          ...messageParamsMock,
+          siwe: siweMockFound,
+        },
+        requestMock,
+      );
+    });
+  });
+
+  describe('newUnsignedTypedMessage', () => {
+    it('adds message to typed message manager', async () => {
+      signController.newUnsignedTypedMessage(
+        messageParamsMock,
+        requestMock,
+        versionMock,
+      );
+
+      expect(
+        typedMessageManagerMock.addUnapprovedMessageAsync,
+      ).toHaveBeenCalledTimes(1);
+      expect(
+        typedMessageManagerMock.addUnapprovedMessageAsync,
+      ).toHaveBeenCalledWith(messageParamsMock, versionMock, requestMock);
+    });
+  });
+
+  describe.each([
+    ['signMessage', messageManagerMock],
+    ['signPersonalMessage', personalMessageManagerMock],
+    ['signTypedMessage', typedMessageManagerMock],
+  ])('%s', (signMethodName, messageManager) => {
+    beforeEach(() => {
+      messageManager.approveMessage.mockResolvedValueOnce(messageParamsMock2);
+
+      keyringControllerMock[signMethodName].mockResolvedValueOnce(
+        signatureMock,
+      );
+    });
+
+    it('approves message and signs', async () => {
+      await signController[signMethodName](messageParamsMock);
+
+      const keyringControllerExtraArgs =
+        signMethodName === 'signTypedMessage'
+          ? [{ version: messageParamsMock.version }]
+          : [];
+
+      expect(keyringControllerMock[signMethodName]).toHaveBeenCalledTimes(1);
+      expect(keyringControllerMock[signMethodName]).toHaveBeenCalledWith(
+        messageParamsMock2,
+        ...keyringControllerExtraArgs,
+      );
+
+      expect(messageManager.setMessageStatusSigned).toHaveBeenCalledTimes(1);
+      expect(messageManager.setMessageStatusSigned).toHaveBeenCalledWith(
+        messageParamsMock2.metamaskId,
+        signatureMock,
+      );
+    });
+
+    it('returns current state', async () => {
+      getStateMock.mockReturnValueOnce(stateMock);
+      expect(await signController[signMethodName](messageParamsMock)).toEqual(
+        stateMock,
+      );
+    });
+
+    it('accepts approval', async () => {
+      await signController[signMethodName](messageParamsMock);
+
+      expect(messengerMock.call).toHaveBeenCalledTimes(1);
+      expect(messengerMock.call).toHaveBeenCalledWith(
+        'ApprovalController:acceptRequest',
+        messageParamsMock.metamaskId,
+      );
+    });
+
+    it('rejects message on error', async () => {
+      keyringControllerMock[signMethodName].mockReset();
+      keyringControllerMock[signMethodName].mockRejectedValue(
+        new Error('Test Error'),
+      );
+
+      await expect(
+        signController[signMethodName](messageParamsMock),
+      ).rejects.toThrow('Test Error');
+
+      expect(messageManager.rejectMessage).toHaveBeenCalledTimes(1);
+      expect(messageManager.rejectMessage).toHaveBeenCalledWith(
+        messageParamsMock.metamaskId,
+      );
+    });
+
+    it('rejects approval on error', async () => {
+      keyringControllerMock[signMethodName].mockReset();
+      keyringControllerMock[signMethodName].mockRejectedValue(
+        new Error('Test Error'),
+      );
+
+      await expect(
+        signController[signMethodName](messageParamsMock),
+      ).rejects.toThrow('Test Error');
+
+      expect(messengerMock.call).toHaveBeenCalledTimes(1);
+      expect(messengerMock.call).toHaveBeenCalledWith(
+        'ApprovalController:rejectRequest',
+        messageParamsMock.metamaskId,
+        'Cancel',
+      );
+    });
+  });
+
+  describe.each([
+    ['cancelMessage', messageManagerMock],
+    ['cancelPersonalMessage', personalMessageManagerMock],
+    ['cancelTypedMessage', typedMessageManagerMock],
+  ])('%s', (cancelMethodName, messageManager) => {
+    it('rejects message using message manager', async () => {
+      signController[cancelMethodName](messageIdMock);
+
+      expect(messageManager.rejectMessage).toHaveBeenCalledTimes(1);
+      expect(messageManager.rejectMessage).toHaveBeenCalledWith(
+        messageParamsMock.metamaskId,
+      );
+    });
+
+    it('rejects approval using approval controller', async () => {
+      signController[cancelMethodName](messageIdMock);
+
+      expect(messengerMock.call).toHaveBeenCalledTimes(1);
+      expect(messengerMock.call).toHaveBeenCalledWith(
+        'ApprovalController:rejectRequest',
+        messageParamsMock.metamaskId,
+        'Cancel',
+      );
+    });
+  });
+
+  describe('message manager events', () => {
+    it.each([
+      ['message manager', messageManagerMock],
+      ['personal message manager', personalMessageManagerMock],
+      ['typed message manager', typedMessageManagerMock],
+    ])('bubbles update badge event from %s', (_, messageManager) => {
+      const mockListener = jest.fn();
+
+      signController.hub.on('updateBadge', mockListener);
+      messageManager.hub.on.mock.calls[0][1]();
+
+      expect(mockListener).toHaveBeenCalledTimes(1);
+    });
+
+    it.each([
+      ['message manager', messageManagerMock, 'eth_sign'],
+      ['personal message manager', personalMessageManagerMock, 'personal_sign'],
+      ['typed message manager', typedMessageManagerMock, 'eth_signTypedData'],
+    ])(
+      'requires approval on unapproved message event from %s',
+      (_, messageManager, methodName) => {
+        messengerMock.call.mockResolvedValueOnce({});
+
+        messageManager.hub.on.mock.calls[1][1](messageParamsMock);
+
+        expect(messengerMock.call).toHaveBeenCalledTimes(1);
+        expect(messengerMock.call).toHaveBeenCalledWith(
+          'ApprovalController:addRequest',
+          {
+            id: messageIdMock,
+            origin: messageParamsMock.origin,
+            type: methodName,
+          },
+          true,
+        );
+      },
+    );
+
+    it('updates state on message manager state change', async () => {
+      securityProviderRequestMock.mockResolvedValue(
+        securityProviderResponseMock,
+      );
+
+      await messageManagerMock.subscribe.mock.calls[0][0]({
+        unapprovedMessages: { [messageIdMock]: coreMessageMock as any },
+        unapprovedMessagesCount: 3,
+      });
+
+      expect(await signController.state).toEqual({
+        unapprovedMsgs: { [messageIdMock]: stateMessageMock as any },
+        unapprovedPersonalMsgs: {},
+        unapprovedTypedMessages: {},
+        unapprovedMsgCount: 3,
+        unapprovedPersonalMsgCount: 0,
+        unapprovedTypedMessagesCount: 0,
+      });
+    });
+
+    it('updates state on personal message manager state change', async () => {
+      securityProviderRequestMock.mockResolvedValue(
+        securityProviderResponseMock,
+      );
+
+      await personalMessageManagerMock.subscribe.mock.calls[0][0]({
+        unapprovedMessages: { [messageIdMock]: coreMessageMock as any },
+        unapprovedMessagesCount: 4,
+      });
+
+      expect(await signController.state).toEqual({
+        unapprovedMsgs: {},
+        unapprovedPersonalMsgs: { [messageIdMock]: stateMessageMock as any },
+        unapprovedTypedMessages: {},
+        unapprovedMsgCount: 0,
+        unapprovedPersonalMsgCount: 4,
+        unapprovedTypedMessagesCount: 0,
+      });
+    });
+
+    it('updates state on typed message manager state change', async () => {
+      securityProviderRequestMock.mockResolvedValue(
+        securityProviderResponseMock,
+      );
+
+      await typedMessageManagerMock.subscribe.mock.calls[0][0]({
+        unapprovedMessages: { [messageIdMock]: coreMessageMock as any },
+        unapprovedMessagesCount: 5,
+      });
+
+      expect(await signController.state).toEqual({
+        unapprovedMsgs: {},
+        unapprovedPersonalMsgs: {},
+        unapprovedTypedMessages: { [messageIdMock]: stateMessageMock as any },
+        unapprovedMsgCount: 0,
+        unapprovedPersonalMsgCount: 0,
+        unapprovedTypedMessagesCount: 5,
+      });
+    });
+  });
+});
diff --git a/app/scripts/controllers/sign.ts b/app/scripts/controllers/sign.ts
new file mode 100644
index 000000000..13157d502
--- /dev/null
+++ b/app/scripts/controllers/sign.ts
@@ -0,0 +1,658 @@
+import EventEmitter from 'events';
+import log from 'loglevel';
+import {
+  MessageManager,
+  MessageParams,
+  MessageParamsMetamask,
+  PersonalMessageManager,
+  PersonalMessageParams,
+  PersonalMessageParamsMetamask,
+  TypedMessageManager,
+  TypedMessageParams,
+  TypedMessageParamsMetamask,
+} from '@metamask/message-manager';
+import { ethErrors } from 'eth-rpc-errors';
+import { bufferToHex } from 'ethereumjs-util';
+import { KeyringController } from '@metamask/eth-keyring-controller';
+import {
+  AbstractMessageManager,
+  AbstractMessage,
+  MessageManagerState,
+  AbstractMessageParams,
+  AbstractMessageParamsMetamask,
+  OriginalRequest,
+} from '@metamask/message-manager/dist/AbstractMessageManager';
+import {
+  BaseControllerV2,
+  RestrictedControllerMessenger,
+} from '@metamask/base-controller';
+import { Patch } from 'immer';
+import {
+  AcceptRequest,
+  AddApprovalRequest,
+  RejectRequest,
+} from '@metamask/approval-controller';
+import { EVENT } from '../../../shared/constants/metametrics';
+import { detectSIWE } from '../../../shared/modules/siwe';
+import PreferencesController from './preferences';
+
+const controllerName = 'SignController';
+const methodNameSign = 'eth_sign';
+const methodNamePersonalSign = 'personal_sign';
+const methodNameTypedSign = 'eth_signTypedData';
+
+const stateMetadata = {
+  unapprovedMsgs: { persist: false, anonymous: false },
+  unapprovedPersonalMsgs: { persist: false, anonymous: false },
+  unapprovedTypedMessages: { persist: false, anonymous: false },
+  unapprovedMsgCount: { persist: false, anonymous: false },
+  unapprovedPersonalMsgCount: { persist: false, anonymous: false },
+  unapprovedTypedMessagesCount: { persist: false, anonymous: false },
+};
+
+const getDefaultState = () => ({
+  unapprovedMsgs: {},
+  unapprovedPersonalMsgs: {},
+  unapprovedTypedMessages: {},
+  unapprovedMsgCount: 0,
+  unapprovedPersonalMsgCount: 0,
+  unapprovedTypedMessagesCount: 0,
+});
+
+export type CoreMessage = AbstractMessage & {
+  messageParams: AbstractMessageParams;
+};
+
+export type StateMessage = Required<AbstractMessage> & {
+  msgParams: Required<AbstractMessageParams>;
+  securityProviderResponse: any;
+};
+
+export type SignControllerState = {
+  unapprovedMsgs: Record<string, StateMessage>;
+  unapprovedPersonalMsgs: Record<string, StateMessage>;
+  unapprovedTypedMessages: Record<string, StateMessage>;
+  unapprovedMsgCount: number;
+  unapprovedPersonalMsgCount: number;
+  unapprovedTypedMessagesCount: number;
+};
+
+export type GetSignState = {
+  type: `${typeof controllerName}:getState`;
+  handler: () => SignControllerState;
+};
+
+export type SignStateChange = {
+  type: `${typeof controllerName}:stateChange`;
+  payload: [SignControllerState, Patch[]];
+};
+
+export type SignControllerActions = GetSignState;
+
+export type SignControllerEvents = SignStateChange;
+
+type AllowedActions = AddApprovalRequest | AcceptRequest | RejectRequest;
+
+export type SignControllerMessenger = RestrictedControllerMessenger<
+  typeof controllerName,
+  SignControllerActions | AllowedActions,
+  SignControllerEvents,
+  AllowedActions['type'],
+  never
+>;
+
+export type SignControllerOptions = {
+  messenger: SignControllerMessenger;
+  keyringController: KeyringController;
+  preferencesController: PreferencesController;
+  sendUpdate: () => void;
+  getState: () => any;
+  metricsEvent: (payload: any, options?: any) => void;
+  securityProviderRequest: (
+    requestData: any,
+    methodName: string,
+  ) => Promise<any>;
+};
+
+/**
+ * Controller for creating signing requests requiring user approval.
+ */
+export default class SignController extends BaseControllerV2<
+  typeof controllerName,
+  SignControllerState,
+  SignControllerMessenger
+> {
+  hub: EventEmitter;
+
+  private _keyringController: KeyringController;
+
+  private _preferencesController: PreferencesController;
+
+  private _getState: () => any;
+
+  private _messageManager: MessageManager;
+
+  private _personalMessageManager: PersonalMessageManager;
+
+  private _typedMessageManager: TypedMessageManager;
+
+  private _messageManagers: AbstractMessageManager<
+    AbstractMessage,
+    AbstractMessageParams,
+    AbstractMessageParamsMetamask
+  >[];
+
+  private _metricsEvent: (payload: any, options?: any) => void;
+
+  private _securityProviderRequest: (
+    requestData: any,
+    methodName: string,
+  ) => Promise<any>;
+
+  /**
+   * Construct a Sign controller.
+   *
+   * @param options - The controller options.
+   * @param options.messenger - The restricted controller messenger for the sign controller.
+   * @param options.keyringController - An instance of a keyring controller used to perform the signing operations.
+   * @param options.preferencesController - An instance of a preferences controller to limit operations based on user configuration.
+   * @param options.getState - Callback to retrieve all user state.
+   * @param options.metricsEvent - A function for emitting a metric event.
+   * @param options.securityProviderRequest - A function for verifying a message, whether it is malicious or not.
+   */
+  constructor({
+    messenger,
+    keyringController,
+    preferencesController,
+    getState,
+    metricsEvent,
+    securityProviderRequest,
+  }: SignControllerOptions) {
+    super({
+      name: controllerName,
+      metadata: stateMetadata,
+      messenger,
+      state: getDefaultState(),
+    });
+
+    this._keyringController = keyringController;
+    this._preferencesController = preferencesController;
+    this._getState = getState;
+    this._metricsEvent = metricsEvent;
+    this._securityProviderRequest = securityProviderRequest;
+
+    this.hub = new EventEmitter();
+    this._messageManager = new MessageManager();
+    this._personalMessageManager = new PersonalMessageManager();
+    this._typedMessageManager = new TypedMessageManager();
+
+    this._messageManagers = [
+      this._messageManager,
+      this._personalMessageManager,
+      this._typedMessageManager,
+    ];
+
+    const methodNames = [
+      methodNameSign,
+      methodNamePersonalSign,
+      methodNameTypedSign,
+    ];
+
+    this._messageManagers.forEach((messageManager, index) => {
+      this._bubbleEvents(messageManager);
+
+      messageManager.hub.on(
+        'unapprovedMessage',
+        (msgParams: AbstractMessageParamsMetamask) => {
+          this._requestApproval(msgParams, methodNames[index]);
+        },
+      );
+    });
+
+    this._subscribeToMessageState(
+      this._messageManager,
+      (state, newMessages, messageCount) => {
+        state.unapprovedMsgs = newMessages;
+        state.unapprovedMsgCount = messageCount;
+      },
+    );
+
+    this._subscribeToMessageState(
+      this._personalMessageManager,
+      (state, newMessages, messageCount) => {
+        state.unapprovedPersonalMsgs = newMessages;
+        state.unapprovedPersonalMsgCount = messageCount;
+      },
+    );
+
+    this._subscribeToMessageState(
+      this._typedMessageManager,
+      (state, newMessages, messageCount) => {
+        state.unapprovedTypedMessages = newMessages;
+        state.unapprovedTypedMessagesCount = messageCount;
+      },
+    );
+  }
+
+  /**
+   * A getter for the number of 'unapproved' Messages in this.messages
+   *
+   * @returns The number of 'unapproved' Messages in this.messages
+   */
+  get unapprovedMsgCount(): number {
+    return this._messageManager.getUnapprovedMessagesCount();
+  }
+
+  /**
+   * A getter for the number of 'unapproved' PersonalMessages in this.messages
+   *
+   * @returns The number of 'unapproved' PersonalMessages in this.messages
+   */
+  get unapprovedPersonalMessagesCount(): number {
+    return this._personalMessageManager.getUnapprovedMessagesCount();
+  }
+
+  /**
+   * A getter for the number of 'unapproved' TypedMessages in this.messages
+   *
+   * @returns The number of 'unapproved' TypedMessages in this.messages
+   */
+  get unapprovedTypedMessagesCount(): number {
+    return this._typedMessageManager.getUnapprovedMessagesCount();
+  }
+
+  /**
+   * Reset the controller state to the initial state.
+   */
+  resetState() {
+    this.update(() => getDefaultState());
+  }
+
+  /**
+   * Called when a Dapp uses the eth_sign method, to request user approval.
+   * eth_sign is a pure signature of arbitrary data. It is on a deprecation
+   * path, since this data can be a transaction, or can leak private key
+   * information.
+   *
+   * @param msgParams - The params passed to eth_sign.
+   * @param [req] - The original request, containing the origin.
+   */
+  async newUnsignedMessage(
+    msgParams: MessageParams,
+    req: OriginalRequest,
+  ): Promise<string> {
+    const {
+      // eslint-disable-next-line camelcase
+      disabledRpcMethodPreferences: { eth_sign },
+    } = this._preferencesController.store.getState() as any;
+
+    // eslint-disable-next-line camelcase
+    if (!eth_sign) {
+      throw ethErrors.rpc.methodNotFound(
+        'eth_sign has been disabled. You must enable it in the advanced settings',
+      );
+    }
+
+    const data = this._normalizeMsgData(msgParams.data);
+
+    // 64 hex + "0x" at the beginning
+    // This is needed because Ethereum's EcSign works only on 32 byte numbers
+    // For 67 length see: https://github.com/MetaMask/metamask-extension/pull/12679/files#r749479607
+    if (data.length !== 66 && data.length !== 67) {
+      throw ethErrors.rpc.invalidParams(
+        'eth_sign requires 32 byte message hash',
+      );
+    }
+
+    return this._messageManager.addUnapprovedMessageAsync(msgParams, req);
+  }
+
+  /**
+   * Called when a dapp uses the personal_sign method.
+   * This is identical to the Geth eth_sign method, and may eventually replace
+   * eth_sign.
+   *
+   * We currently define our eth_sign and personal_sign mostly for legacy Dapps.
+   *
+   * @param msgParams - The params of the message to sign & return to the Dapp.
+   * @param req - The original request, containing the origin.
+   */
+  async newUnsignedPersonalMessage(
+    msgParams: PersonalMessageParams,
+    req: OriginalRequest,
+  ): Promise<string> {
+    const ethereumSignInData = this._getEthereumSignInData(msgParams);
+    const finalMsgParams = { ...msgParams, siwe: ethereumSignInData };
+
+    return this._personalMessageManager.addUnapprovedMessageAsync(
+      finalMsgParams,
+      req,
+    );
+  }
+
+  /**
+   * Called when a dapp uses the eth_signTypedData method, per EIP 712.
+   *
+   * @param msgParams - The params passed to eth_signTypedData.
+   * @param req - The original request, containing the origin.
+   * @param version
+   */
+  async newUnsignedTypedMessage(
+    msgParams: TypedMessageParams,
+    req: OriginalRequest,
+    version: string,
+  ): Promise<string> {
+    return this._typedMessageManager.addUnapprovedMessageAsync(
+      msgParams,
+      version,
+      req,
+    );
+  }
+
+  /**
+   * Signifies user intent to complete an eth_sign method.
+   *
+   * @param msgParams - The params passed to eth_call.
+   * @returns Full state update.
+   */
+  async signMessage(msgParams: MessageParamsMetamask) {
+    return await this._signAbstractMessage(
+      this._messageManager,
+      methodNameSign,
+      msgParams,
+      async (cleanMsgParams) =>
+        await this._keyringController.signMessage(cleanMsgParams),
+    );
+  }
+
+  /**
+   * Signifies a user's approval to sign a personal_sign message in queue.
+   * Triggers signing, and the callback function from newUnsignedPersonalMessage.
+   *
+   * @param msgParams - The params of the message to sign & return to the Dapp.
+   * @returns A full state update.
+   */
+  async signPersonalMessage(msgParams: PersonalMessageParamsMetamask) {
+    return await this._signAbstractMessage(
+      this._personalMessageManager,
+      methodNamePersonalSign,
+      msgParams,
+      async (cleanMsgParams) =>
+        await this._keyringController.signPersonalMessage(cleanMsgParams),
+    );
+  }
+
+  /**
+   * The method for a user approving a call to eth_signTypedData, per EIP 712.
+   * Triggers the callback in newUnsignedTypedMessage.
+   *
+   * @param msgParams - The params passed to eth_signTypedData.
+   * @returns Full state update.
+   */
+  async signTypedMessage(msgParams: TypedMessageParamsMetamask) {
+    const { version } = msgParams;
+
+    return await this._signAbstractMessage(
+      this._typedMessageManager,
+      methodNameTypedSign,
+      msgParams,
+      async (cleanMsgParams) => {
+        // For some reason every version after V1 used stringified params.
+        if (version !== 'V1') {
+          // But we don't have to require that. We can stop suggesting it now:
+          if (typeof cleanMsgParams.data === 'string') {
+            cleanMsgParams.data = JSON.parse(cleanMsgParams.data);
+          }
+        }
+
+        return await this._keyringController.signTypedMessage(cleanMsgParams, {
+          version,
+        });
+      },
+    );
+  }
+
+  /**
+   * Used to cancel a message submitted via eth_sign.
+   *
+   * @param msgId - The id of the message to cancel.
+   */
+  cancelMessage(msgId: string) {
+    this._cancelAbstractMessage(this._messageManager, msgId);
+  }
+
+  /**
+   * Used to cancel a personal_sign type message.
+   *
+   * @param msgId - The ID of the message to cancel.
+   */
+  cancelPersonalMessage(msgId: string) {
+    this._cancelAbstractMessage(this._personalMessageManager, msgId);
+  }
+
+  /**
+   * Used to cancel a eth_signTypedData type message.
+   *
+   * @param msgId - The ID of the message to cancel.
+   */
+  cancelTypedMessage(msgId: string) {
+    this._cancelAbstractMessage(this._typedMessageManager, msgId);
+  }
+
+  /**
+   * Reject all unapproved messages of any type.
+   *
+   * @param reason - A message to indicate why.
+   */
+  rejectUnapproved(reason?: string) {
+    this._messageManagers.forEach((messageManager) => {
+      Object.keys(messageManager.getUnapprovedMessages()).forEach(
+        (messageId) => {
+          this._cancelAbstractMessage(messageManager, messageId, reason);
+        },
+      );
+    });
+  }
+
+  /**
+   * Clears all unapproved messages from memory.
+   */
+  clearUnapproved() {
+    this._messageManagers.forEach((messageManager) => {
+      messageManager.update({
+        unapprovedMessages: {},
+        unapprovedMessagesCount: 0,
+      });
+    });
+  }
+
+  private async _signAbstractMessage<P extends AbstractMessageParams>(
+    messageManager: AbstractMessageManager<
+      AbstractMessage,
+      P,
+      AbstractMessageParamsMetamask
+    >,
+    methodName: string,
+    msgParams: AbstractMessageParamsMetamask,
+    getSignature: (cleanMessageParams: P) => Promise<any>,
+  ) {
+    log.info(`MetaMaskController - ${methodName}`);
+
+    const messageId = msgParams.metamaskId as string;
+
+    try {
+      const cleanMessageParams = await messageManager.approveMessage(msgParams);
+      const signature = await getSignature(cleanMessageParams);
+
+      messageManager.setMessageStatusSigned(messageId, signature);
+
+      this._acceptApproval(messageId);
+
+      return this._getState();
+    } catch (error) {
+      log.info(`MetaMaskController - ${methodName} failed.`, error);
+      this._cancelAbstractMessage(messageManager, messageId);
+      throw error;
+    }
+  }
+
+  private _cancelAbstractMessage(
+    messageManager: AbstractMessageManager<
+      AbstractMessage,
+      AbstractMessageParams,
+      AbstractMessageParamsMetamask
+    >,
+    messageId: string,
+    reason?: string,
+  ) {
+    if (reason) {
+      const message = this._getMessage(messageId);
+
+      this._metricsEvent({
+        event: reason,
+        category: EVENT.CATEGORIES.TRANSACTIONS,
+        properties: {
+          action: 'Sign Request',
+          type: message.type,
+        },
+      });
+    }
+
+    messageManager.rejectMessage(messageId);
+    this._rejectApproval(messageId);
+
+    return this._getState();
+  }
+
+  private _bubbleEvents(
+    messageManager: AbstractMessageManager<
+      AbstractMessage,
+      AbstractMessageParams,
+      AbstractMessageParamsMetamask
+    >,
+  ) {
+    messageManager.hub.on('updateBadge', () => {
+      this.hub.emit('updateBadge');
+    });
+  }
+
+  private _subscribeToMessageState(
+    messageManager: AbstractMessageManager<
+      AbstractMessage,
+      AbstractMessageParams,
+      AbstractMessageParamsMetamask
+    >,
+    updateState: (
+      state: SignControllerState,
+      newMessages: Record<string, StateMessage>,
+      messageCount: number,
+    ) => void,
+  ) {
+    messageManager.subscribe(
+      async (state: MessageManagerState<AbstractMessage>) => {
+        const newMessages = await this._migrateMessages(
+          state.unapprovedMessages as any,
+        );
+
+        this.update((draftState) => {
+          updateState(draftState, newMessages, state.unapprovedMessagesCount);
+        });
+      },
+    );
+  }
+
+  private async _migrateMessages(
+    coreMessages: Record<string, CoreMessage>,
+  ): Promise<Record<string, StateMessage>> {
+    const stateMessages: Record<string, StateMessage> = {};
+
+    for (const messageId of Object.keys(coreMessages)) {
+      const coreMessage = coreMessages[messageId];
+      const stateMessage = await this._migrateMessage(coreMessage);
+
+      stateMessages[messageId] = stateMessage;
+    }
+
+    return stateMessages;
+  }
+
+  private async _migrateMessage(
+    coreMessage: CoreMessage,
+  ): Promise<StateMessage> {
+    const { messageParams, ...coreMessageData } = coreMessage;
+
+    // Core message managers use messageParams but frontend uses msgParams with lots of references
+    const stateMessage = {
+      ...coreMessageData,
+      rawSig: coreMessage.rawSig as string,
+      msgParams: {
+        ...messageParams,
+        origin: messageParams.origin as string,
+      },
+    };
+
+    const messageId = coreMessage.id;
+    const existingMessage = this._getMessage(messageId);
+
+    const securityProviderResponse = existingMessage
+      ? existingMessage.securityProviderResponse
+      : await this._securityProviderRequest(stateMessage, stateMessage.type);
+
+    return { ...stateMessage, securityProviderResponse };
+  }
+
+  private _normalizeMsgData(data: string) {
+    if (data.slice(0, 2) === '0x') {
+      // data is already hex
+      return data;
+    }
+    // data is unicode, convert to hex
+    return bufferToHex(Buffer.from(data, 'utf8'));
+  }
+
+  private _getMessage(messageId: string): StateMessage {
+    return {
+      ...this.state.unapprovedMsgs,
+      ...this.state.unapprovedPersonalMsgs,
+      ...this.state.unapprovedTypedMessages,
+    }[messageId];
+  }
+
+  private _getEthereumSignInData(messgeParams: PersonalMessageParams): any {
+    return detectSIWE(messgeParams);
+  }
+
+  private _requestApproval(
+    msgParams: AbstractMessageParamsMetamask,
+    type: string,
+  ) {
+    const id = msgParams.metamaskId as string;
+    const origin = msgParams.origin || controllerName;
+
+    this.messagingSystem
+      .call(
+        'ApprovalController:addRequest',
+        {
+          id,
+          origin,
+          type,
+        },
+        true,
+      )
+      .catch(() => {
+        // Intentionally ignored as promise not currently used
+      });
+  }
+
+  private _acceptApproval(messageId: string) {
+    this.messagingSystem.call('ApprovalController:acceptRequest', messageId);
+  }
+
+  private _rejectApproval(messageId: string) {
+    this.messagingSystem.call(
+      'ApprovalController:rejectRequest',
+      messageId,
+      'Cancel',
+    );
+  }
+}
diff --git a/app/scripts/lib/message-manager.js b/app/scripts/lib/message-manager.js
deleted file mode 100644
index b070e65a0..000000000
--- a/app/scripts/lib/message-manager.js
+++ /dev/null
@@ -1,329 +0,0 @@
-import EventEmitter from 'events';
-import { ObservableStore } from '@metamask/obs-store';
-import { bufferToHex } from 'ethereumjs-util';
-import { ethErrors } from 'eth-rpc-errors';
-import { MESSAGE_TYPE } from '../../../shared/constants/app';
-import { METAMASK_CONTROLLER_EVENTS } from '../metamask-controller';
-import createId from '../../../shared/modules/random-id';
-import { EVENT } from '../../../shared/constants/metametrics';
-
-/**
- * Represents, and contains data about, an 'eth_sign' type signature request. These are created when a signature for
- * an eth_sign call is requested.
- *
- * @see {@link https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign}
- * @typedef {object} Message
- * @property {number} id An id to track and identify the message object
- * @property {object} msgParams The parameters to pass to the eth_sign method once the signature request is approved.
- * @property {object} msgParams.metamaskId Added to msgParams for tracking and identification within MetaMask.
- * @property {string} msgParams.data A hex string conversion of the raw buffer data of the signature request
- * @property {number} time The epoch time at which the this message was created
- * @property {string} status Indicates whether the signature request is 'unapproved', 'approved', 'signed' or 'rejected'
- * @property {string} type The json-prc signing method for which a signature request has been made. A 'Message' with
- * always have a 'eth_sign' type.
- */
-
-export default class MessageManager extends EventEmitter {
-  /**
-   * Controller in charge of managing - storing, adding, removing, updating - Messages.
-   *
-   * @param {object} opts - Controller options
-   * @param {Function} opts.metricsEvent - A function for emitting a metric event.
-   * @param {Function} opts.securityProviderRequest - A function for verifying a message, whether it is malicious or not.
-   */
-  constructor({ metricsEvent, securityProviderRequest }) {
-    super();
-    this.memStore = new ObservableStore({
-      unapprovedMsgs: {},
-      unapprovedMsgCount: 0,
-    });
-
-    this.resetState = () => {
-      this.memStore.updateState({
-        unapprovedMsgs: {},
-        unapprovedMsgCount: 0,
-      });
-    };
-
-    this.messages = [];
-    this.metricsEvent = metricsEvent;
-    this.securityProviderRequest = securityProviderRequest;
-  }
-
-  /**
-   * A getter for the number of 'unapproved' Messages in this.messages
-   *
-   * @returns {number} The number of 'unapproved' Messages in this.messages
-   */
-  get unapprovedMsgCount() {
-    return Object.keys(this.getUnapprovedMsgs()).length;
-  }
-
-  /**
-   * A getter for the 'unapproved' Messages in this.messages
-   *
-   * @returns {object} An index of Message ids to Messages, for all 'unapproved' Messages in this.messages
-   */
-  getUnapprovedMsgs() {
-    return this.messages
-      .filter((msg) => msg.status === 'unapproved')
-      .reduce((result, msg) => {
-        result[msg.id] = msg;
-        return result;
-      }, {});
-  }
-
-  /**
-   * Creates a new Message with an 'unapproved' status using the passed msgParams. this.addMsg is called to add the
-   * new Message to this.messages, and to save the unapproved Messages from that list to this.memStore.
-   *
-   * @param {object} msgParams - The params for the eth_sign call to be made after the message is approved.
-   * @param {object} [req] - The original request object possibly containing the origin
-   * @returns {promise} after signature has been
-   */
-  async addUnapprovedMessageAsync(msgParams, req) {
-    const msgId = await this.addUnapprovedMessage(msgParams, req);
-    return await new Promise((resolve, reject) => {
-      // await finished
-      this.once(`${msgId}:finished`, (data) => {
-        switch (data.status) {
-          case 'signed':
-            return resolve(data.rawSig);
-          case 'rejected':
-            return reject(
-              ethErrors.provider.userRejectedRequest(
-                'MetaMask Message Signature: User denied message signature.',
-              ),
-            );
-          case 'errored':
-            return reject(
-              new Error(`MetaMask Message Signature: ${data.error}`),
-            );
-          default:
-            return reject(
-              new Error(
-                `MetaMask Message Signature: Unknown problem: ${JSON.stringify(
-                  msgParams,
-                )}`,
-              ),
-            );
-        }
-      });
-    });
-  }
-
-  /**
-   * Creates a new Message with an 'unapproved' status using the passed msgParams. this.addMsg is called to add the
-   * new Message to this.messages, and to save the unapproved Messages from that list to this.memStore.
-   *
-   * @param {object} msgParams - The params for the eth_sign call to be made after the message is approved.
-   * @param {object} [req] - The original request object where the origin may be specified
-   * @returns {number} The id of the newly created message.
-   */
-  async addUnapprovedMessage(msgParams, req) {
-    // add origin from request
-    if (req) {
-      msgParams.origin = req.origin;
-    }
-    msgParams.data = normalizeMsgData(msgParams.data);
-    // create txData obj with parameters and meta data
-    const time = new Date().getTime();
-    const msgId = createId();
-    const msgData = {
-      id: msgId,
-      msgParams,
-      time,
-      status: 'unapproved',
-      type: MESSAGE_TYPE.ETH_SIGN,
-    };
-    this.addMsg(msgData);
-
-    const securityProviderResponse = await this.securityProviderRequest(
-      msgData,
-      msgData.type,
-    );
-
-    msgData.securityProviderResponse = securityProviderResponse;
-
-    // signal update
-    this.emit('update');
-    return msgId;
-  }
-
-  /**
-   * Adds a passed Message to this.messages, and calls this._saveMsgList() to save the unapproved Messages from that
-   * list to this.memStore.
-   *
-   * @param {Message} msg - The Message to add to this.messages
-   */
-  addMsg(msg) {
-    this.messages.push(msg);
-    this._saveMsgList();
-  }
-
-  /**
-   * Returns a specified Message.
-   *
-   * @param {number} msgId - The id of the Message to get
-   * @returns {Message|undefined} The Message with the id that matches the passed msgId, or undefined if no Message has that id.
-   */
-  getMsg(msgId) {
-    return this.messages.find((msg) => msg.id === msgId);
-  }
-
-  /**
-   * Approves a Message. Sets the message status via a call to this.setMsgStatusApproved, and returns a promise with
-   * any the message params modified for proper signing.
-   *
-   * @param {object} msgParams - The msgParams to be used when eth_sign is called, plus data added by MetaMask.
-   * @param {object} msgParams.metamaskId - Added to msgParams for tracking and identification within MetaMask.
-   * @returns {Promise<object>} Promises the msgParams object with metamaskId removed.
-   */
-  approveMessage(msgParams) {
-    this.setMsgStatusApproved(msgParams.metamaskId);
-    return this.prepMsgForSigning(msgParams);
-  }
-
-  /**
-   * Sets a Message status to 'approved' via a call to this._setMsgStatus.
-   *
-   * @param {number} msgId - The id of the Message to approve.
-   */
-  setMsgStatusApproved(msgId) {
-    this._setMsgStatus(msgId, 'approved');
-  }
-
-  /**
-   * Sets a Message status to 'signed' via a call to this._setMsgStatus and updates that Message in this.messages by
-   * adding the raw signature data of the signature request to the Message
-   *
-   * @param {number} msgId - The id of the Message to sign.
-   * @param {buffer} rawSig - The raw data of the signature request
-   */
-  setMsgStatusSigned(msgId, rawSig) {
-    const msg = this.getMsg(msgId);
-    msg.rawSig = rawSig;
-    this._updateMsg(msg);
-    this._setMsgStatus(msgId, 'signed');
-  }
-
-  /**
-   * Removes the metamaskId property from passed msgParams and returns a promise which resolves the updated msgParams
-   *
-   * @param {object} msgParams - The msgParams to modify
-   * @returns {Promise<object>} Promises the msgParams with the metamaskId property removed
-   */
-  async prepMsgForSigning(msgParams) {
-    delete msgParams.metamaskId;
-    return msgParams;
-  }
-
-  /**
-   * Sets a Message status to 'rejected' via a call to this._setMsgStatus.
-   *
-   * @param {number} msgId - The id of the Message to reject.
-   * @param reason
-   */
-  rejectMsg(msgId, reason = undefined) {
-    if (reason) {
-      const msg = this.getMsg(msgId);
-      this.metricsEvent({
-        event: reason,
-        category: EVENT.CATEGORIES.TRANSACTIONS,
-        properties: {
-          action: 'Sign Request',
-          type: msg.type,
-        },
-      });
-    }
-    this._setMsgStatus(msgId, 'rejected');
-  }
-
-  /**
-   * Sets a Message status to 'errored' via a call to this._setMsgStatus.
-   *
-   * @param {number} msgId - The id of the Message to error
-   * @param error
-   */
-  errorMessage(msgId, error) {
-    const msg = this.getMsg(msgId);
-    msg.error = error;
-    this._updateMsg(msg);
-    this._setMsgStatus(msgId, 'errored');
-  }
-
-  /**
-   * Clears all unapproved messages from memory.
-   */
-  clearUnapproved() {
-    this.messages = this.messages.filter((msg) => msg.status !== 'unapproved');
-    this._saveMsgList();
-  }
-
-  /**
-   * Updates the status of a Message in this.messages via a call to this._updateMsg
-   *
-   * @private
-   * @param {number} msgId - The id of the Message to update.
-   * @param {string} status - The new status of the Message.
-   * @throws A 'MessageManager - Message not found for id: "${msgId}".' if there is no Message in this.messages with an
-   * id equal to the passed msgId
-   * @fires An event with a name equal to `${msgId}:${status}`. The Message is also fired.
-   * @fires If status is 'rejected' or 'signed', an event with a name equal to `${msgId}:finished` is fired along with the message
-   */
-  _setMsgStatus(msgId, status) {
-    const msg = this.getMsg(msgId);
-    if (!msg) {
-      throw new Error(`MessageManager - Message not found for id: "${msgId}".`);
-    }
-    msg.status = status;
-    this._updateMsg(msg);
-    this.emit(`${msgId}:${status}`, msg);
-    if (status === 'rejected' || status === 'signed') {
-      this.emit(`${msgId}:finished`, msg);
-    }
-  }
-
-  /**
-   * Sets a Message in this.messages to the passed Message if the ids are equal. Then saves the unapprovedMsg list to
-   * storage via this._saveMsgList
-   *
-   * @private
-   * @param {Message} msg - A Message that will replace an existing Message (with the same id) in this.messages
-   */
-  _updateMsg(msg) {
-    const index = this.messages.findIndex((message) => message.id === msg.id);
-    if (index !== -1) {
-      this.messages[index] = msg;
-    }
-    this._saveMsgList();
-  }
-
-  /**
-   * Saves the unapproved messages, and their count, to this.memStore
-   *
-   * @private
-   * @fires 'updateBadge'
-   */
-  _saveMsgList() {
-    const unapprovedMsgs = this.getUnapprovedMsgs();
-    const unapprovedMsgCount = Object.keys(unapprovedMsgs).length;
-    this.memStore.updateState({ unapprovedMsgs, unapprovedMsgCount });
-    this.emit(METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE);
-  }
-}
-
-/**
- * A helper function that converts raw buffer data to a hex, or just returns the data if it is already formatted as a hex.
- *
- * @param {any} data - The buffer data to convert to a hex
- * @returns {string} A hex string conversion of the buffer data
- */
-export function normalizeMsgData(data) {
-  if (data.slice(0, 2) === '0x') {
-    // data is already hex
-    return data;
-  }
-  // data is unicode, convert to hex
-  return bufferToHex(Buffer.from(data, 'utf8'));
-}
diff --git a/app/scripts/lib/message-manager.test.js b/app/scripts/lib/message-manager.test.js
deleted file mode 100644
index 9a326d000..000000000
--- a/app/scripts/lib/message-manager.test.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import { TransactionStatus } from '../../../shared/constants/transaction';
-import MessageManager from './message-manager';
-
-describe('Message Manager', () => {
-  let messageManager;
-
-  beforeEach(() => {
-    messageManager = new MessageManager({
-      metricsEvent: jest.fn(),
-    });
-  });
-
-  describe('#getMsgList', () => {
-    it('when new should return empty array', () => {
-      const result = messageManager.messages;
-      expect(Array.isArray(result)).toStrictEqual(true);
-      expect(result).toHaveLength(0);
-    });
-  });
-
-  describe('#addMsg', () => {
-    it('adds a Msg returned in getMsgList', () => {
-      const Msg = {
-        id: 1,
-        status: TransactionStatus.approved,
-        metamaskNetworkId: 'unit test',
-      };
-      messageManager.addMsg(Msg);
-      const result = messageManager.messages;
-      expect(Array.isArray(result)).toStrictEqual(true);
-      expect(result).toHaveLength(1);
-      expect(result[0].id).toStrictEqual(1);
-    });
-  });
-
-  describe('#setMsgStatusApproved', () => {
-    it('sets the Msg status to approved', () => {
-      const Msg = {
-        id: 1,
-        status: 'unapproved',
-        metamaskNetworkId: 'unit test',
-      };
-      messageManager.addMsg(Msg);
-      messageManager.setMsgStatusApproved(1);
-      const result = messageManager.messages;
-      expect(Array.isArray(result)).toStrictEqual(true);
-      expect(result).toHaveLength(1);
-      expect(result[0].status).toStrictEqual(TransactionStatus.approved);
-    });
-  });
-
-  describe('#rejectMsg', () => {
-    it('sets the Msg status to rejected', () => {
-      const Msg = {
-        id: 1,
-        status: 'unapproved',
-        metamaskNetworkId: 'unit test',
-      };
-      messageManager.addMsg(Msg);
-      messageManager.rejectMsg(1);
-      const result = messageManager.messages;
-      expect(Array.isArray(result)).toStrictEqual(true);
-      expect(result).toHaveLength(1);
-      expect(result[0].status).toStrictEqual(TransactionStatus.rejected);
-    });
-  });
-
-  describe('#_updateMsg', () => {
-    it('replaces the Msg with the same id', () => {
-      messageManager.addMsg({
-        id: '1',
-        status: 'unapproved',
-        metamaskNetworkId: 'unit test',
-      });
-      messageManager.addMsg({
-        id: '2',
-        status: TransactionStatus.approved,
-        metamaskNetworkId: 'unit test',
-      });
-      messageManager._updateMsg({
-        id: '1',
-        status: 'blah',
-        hash: 'foo',
-        metamaskNetworkId: 'unit test',
-      });
-      const result = messageManager.getMsg('1');
-      expect(result.hash).toStrictEqual('foo');
-    });
-  });
-
-  describe('#getUnapprovedMsgs', () => {
-    it('returns unapproved Msgs in a hash', () => {
-      messageManager.addMsg({
-        id: '1',
-        status: 'unapproved',
-        metamaskNetworkId: 'unit test',
-      });
-      messageManager.addMsg({
-        id: '2',
-        status: TransactionStatus.approved,
-        metamaskNetworkId: 'unit test',
-      });
-      const result = messageManager.getUnapprovedMsgs();
-      expect(typeof result).toStrictEqual('object');
-      expect(result['1'].status).toStrictEqual('unapproved');
-      expect(result['2']).toBeUndefined();
-    });
-  });
-
-  describe('#getMsg', () => {
-    it('returns a Msg with the requested id', () => {
-      messageManager.addMsg({
-        id: '1',
-        status: 'unapproved',
-        metamaskNetworkId: 'unit test',
-      });
-      messageManager.addMsg({
-        id: '2',
-        status: TransactionStatus.approved,
-        metamaskNetworkId: 'unit test',
-      });
-      expect(messageManager.getMsg('1').status).toStrictEqual('unapproved');
-      expect(messageManager.getMsg('2').status).toStrictEqual(
-        TransactionStatus.approved,
-      );
-    });
-  });
-});
diff --git a/app/scripts/lib/typed-message-manager.js b/app/scripts/lib/typed-message-manager.js
deleted file mode 100644
index 231aeb470..000000000
--- a/app/scripts/lib/typed-message-manager.js
+++ /dev/null
@@ -1,421 +0,0 @@
-import EventEmitter from 'events';
-import { strict as assert } from 'assert';
-import { ObservableStore } from '@metamask/obs-store';
-import { ethErrors } from 'eth-rpc-errors';
-import { typedSignatureHash, TYPED_MESSAGE_SCHEMA } from 'eth-sig-util';
-import log from 'loglevel';
-import jsonschema from 'jsonschema';
-import { MESSAGE_TYPE } from '../../../shared/constants/app';
-import { METAMASK_CONTROLLER_EVENTS } from '../metamask-controller';
-import createId from '../../../shared/modules/random-id';
-import { EVENT } from '../../../shared/constants/metametrics';
-import { isValidHexAddress } from '../../../shared/modules/hexstring-utils';
-
-/**
- * Represents, and contains data about, an 'eth_signTypedData' type signature request. These are created when a
- * signature for an eth_signTypedData call is requested.
- *
- * @typedef {object} TypedMessage
- * @property {number} id An id to track and identify the message object
- * @property {object} msgParams The parameters to pass to the eth_signTypedData method once the signature request is
- * approved.
- * @property {object} msgParams.metamaskId Added to msgParams for tracking and identification within MetaMask.
- * @property {object} msgParams.from The address that is making the signature request.
- * @property {string} msgParams.data A hex string conversion of the raw buffer data of the signature request
- * @property {number} time The epoch time at which the this message was created
- * @property {string} status Indicates whether the signature request is 'unapproved', 'approved', 'signed', 'rejected', or 'errored'
- * @property {string} type The json-prc signing method for which a signature request has been made. A 'Message' will
- * always have a 'eth_signTypedData' type.
- */
-
-export default class TypedMessageManager extends EventEmitter {
-  /**
-   * Controller in charge of managing - storing, adding, removing, updating - TypedMessage.
-   *
-   * @param options
-   * @param options.getCurrentChainId
-   * @param options.metricsEvent
-   * @param options.securityProviderRequest
-   */
-  constructor({ getCurrentChainId, metricsEvent, securityProviderRequest }) {
-    super();
-    this._getCurrentChainId = getCurrentChainId;
-    this.memStore = new ObservableStore({
-      unapprovedTypedMessages: {},
-      unapprovedTypedMessagesCount: 0,
-    });
-
-    this.resetState = () => {
-      this.memStore.updateState({
-        unapprovedTypedMessages: {},
-        unapprovedTypedMessagesCount: 0,
-      });
-    };
-
-    this.messages = [];
-    this.metricsEvent = metricsEvent;
-    this.securityProviderRequest = securityProviderRequest;
-  }
-
-  /**
-   * A getter for the number of 'unapproved' TypedMessages in this.messages
-   *
-   * @returns {number} The number of 'unapproved' TypedMessages in this.messages
-   */
-  get unapprovedTypedMessagesCount() {
-    return Object.keys(this.getUnapprovedMsgs()).length;
-  }
-
-  /**
-   * A getter for the 'unapproved' TypedMessages in this.messages
-   *
-   * @returns {object} An index of TypedMessage ids to TypedMessages, for all 'unapproved' TypedMessages in
-   * this.messages
-   */
-  getUnapprovedMsgs() {
-    return this.messages
-      .filter((msg) => msg.status === 'unapproved')
-      .reduce((result, msg) => {
-        result[msg.id] = msg;
-        return result;
-      }, {});
-  }
-
-  /**
-   * Creates a new TypedMessage with an 'unapproved' status using the passed msgParams. this.addMsg is called to add
-   * the new TypedMessage to this.messages, and to save the unapproved TypedMessages from that list to
-   * this.memStore. Before any of this is done, msgParams are validated
-   *
-   * @param {object} msgParams - The params for the eth_sign call to be made after the message is approved.
-   * @param {object} [req] - The original request object possibly containing the origin
-   * @param version
-   * @returns {promise} When the message has been signed or rejected
-   */
-  async addUnapprovedMessageAsync(msgParams, req, version) {
-    return new Promise((resolve, reject) => {
-      this.addUnapprovedMessage(msgParams, req, version).then((msgId) => {
-        this.once(`${msgId}:finished`, (data) => {
-          switch (data.status) {
-            case 'signed':
-              return resolve(data.rawSig);
-            case 'rejected':
-              return reject(
-                ethErrors.provider.userRejectedRequest(
-                  'MetaMask Message Signature: User denied message signature.',
-                ),
-              );
-            case 'errored':
-              return reject(
-                new Error(`MetaMask Message Signature: ${data.error}`),
-              );
-            default:
-              return reject(
-                new Error(
-                  `MetaMask Message Signature: Unknown problem: ${JSON.stringify(
-                    msgParams,
-                  )}`,
-                ),
-              );
-          }
-        });
-      });
-    });
-  }
-
-  /**
-   * Creates a new TypedMessage with an 'unapproved' status using the passed msgParams. this.addMsg is called to add
-   * the new TypedMessage to this.messages, and to save the unapproved TypedMessages from that list to
-   * this.memStore. Before any of this is done, msgParams are validated
-   *
-   * @param {object} msgParams - The params for the eth_sign call to be made after the message is approved.
-   * @param {object} [req] - The original request object possibly containing the origin
-   * @param version
-   * @returns {number} The id of the newly created TypedMessage.
-   */
-  async addUnapprovedMessage(msgParams, req, version) {
-    msgParams.version = version;
-    if (req) {
-      msgParams.origin = req.origin;
-    }
-    this.validateParams(msgParams);
-
-    log.debug(
-      `TypedMessageManager addUnapprovedMessage: ${JSON.stringify(msgParams)}`,
-    );
-
-    // create txData obj with parameters and meta data
-    const time = new Date().getTime();
-    const msgId = createId();
-    const msgData = {
-      id: msgId,
-      msgParams,
-      time,
-      status: 'unapproved',
-      type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA,
-    };
-    this.addMsg(msgData);
-
-    const securityProviderResponse = await this.securityProviderRequest(
-      msgData,
-      msgData.type,
-    );
-
-    msgData.securityProviderResponse = securityProviderResponse;
-
-    // signal update
-    this.emit('update');
-    return msgId;
-  }
-
-  /**
-   * Helper method for this.addUnapprovedMessage. Validates that the passed params have the required properties.
-   *
-   * @param {object} params - The params to validate
-   */
-  validateParams(params) {
-    assert.ok(
-      params && typeof params === 'object',
-      'Params must be an object.',
-    );
-    assert.ok('data' in params, 'Params must include a "data" field.');
-    assert.ok('from' in params, 'Params must include a "from" field.');
-    assert.ok(
-      typeof params.from === 'string' &&
-        isValidHexAddress(params.from, { allowNonPrefixed: false }),
-      '"from" field must be a valid, lowercase, hexadecimal Ethereum address string.',
-    );
-
-    switch (params.version) {
-      case 'V1':
-        assert.ok(
-          Array.isArray(params.data),
-          '"params.data" must be an array.',
-        );
-        assert.doesNotThrow(() => {
-          typedSignatureHash(params.data);
-        }, 'Signing data must be valid EIP-712 typed data.');
-        break;
-      case 'V3':
-      case 'V4': {
-        assert.equal(
-          typeof params.data,
-          'string',
-          '"params.data" must be a string.',
-        );
-        let data;
-        assert.doesNotThrow(() => {
-          data = JSON.parse(params.data);
-        }, '"data" must be a valid JSON string.');
-        const validation = jsonschema.validate(data, TYPED_MESSAGE_SCHEMA);
-        if (validation.errors.length !== 0) {
-          throw ethErrors.rpc.invalidParams({
-            message:
-              'Signing data must conform to EIP-712 schema. See https://git.io/fNtcx.',
-            data: validation.errors.map((v) => v.message.toString()),
-          });
-        }
-        assert.ok(
-          data.primaryType in data.types,
-          `Primary type of "${data.primaryType}" has no type definition.`,
-        );
-        let { chainId } = data.domain;
-        if (chainId) {
-          const activeChainId = parseInt(this._getCurrentChainId(), 16);
-          assert.ok(
-            !Number.isNaN(activeChainId),
-            `Cannot sign messages for chainId "${chainId}", because MetaMask is switching networks.`,
-          );
-          if (typeof chainId === 'string') {
-            chainId = parseInt(chainId, chainId.startsWith('0x') ? 16 : 10);
-          }
-          assert.equal(
-            chainId,
-            activeChainId,
-            `Provided chainId "${chainId}" must match the active chainId "${activeChainId}"`,
-          );
-        }
-        break;
-      }
-      default:
-        assert.fail(`Unknown typed data version "${params.version}"`);
-    }
-  }
-
-  /**
-   * Adds a passed TypedMessage to this.messages, and calls this._saveMsgList() to save the unapproved TypedMessages from that
-   * list to this.memStore.
-   *
-   * @param {Message} msg - The TypedMessage to add to this.messages
-   */
-  addMsg(msg) {
-    this.messages.push(msg);
-    this._saveMsgList();
-  }
-
-  /**
-   * Returns a specified TypedMessage.
-   *
-   * @param {number} msgId - The id of the TypedMessage to get
-   * @returns {TypedMessage|undefined} The TypedMessage with the id that matches the passed msgId, or undefined
-   * if no TypedMessage has that id.
-   */
-  getMsg(msgId) {
-    return this.messages.find((msg) => msg.id === msgId);
-  }
-
-  /**
-   * Approves a TypedMessage. Sets the message status via a call to this.setMsgStatusApproved, and returns a promise
-   * with any the message params modified for proper signing.
-   *
-   * @param {object} msgParams - The msgParams to be used when eth_sign is called, plus data added by MetaMask.
-   * @param {object} msgParams.metamaskId - Added to msgParams for tracking and identification within MetaMask.
-   * @returns {Promise<object>} Promises the msgParams object with metamaskId removed.
-   */
-  approveMessage(msgParams) {
-    this.setMsgStatusApproved(msgParams.metamaskId);
-    return this.prepMsgForSigning(msgParams);
-  }
-
-  /**
-   * Sets a TypedMessage status to 'approved' via a call to this._setMsgStatus.
-   *
-   * @param {number} msgId - The id of the TypedMessage to approve.
-   */
-  setMsgStatusApproved(msgId) {
-    this._setMsgStatus(msgId, 'approved');
-  }
-
-  /**
-   * Sets a TypedMessage status to 'signed' via a call to this._setMsgStatus and updates that TypedMessage in
-   * this.messages by adding the raw signature data of the signature request to the TypedMessage
-   *
-   * @param {number} msgId - The id of the TypedMessage to sign.
-   * @param {buffer} rawSig - The raw data of the signature request
-   */
-  setMsgStatusSigned(msgId, rawSig) {
-    const msg = this.getMsg(msgId);
-    msg.rawSig = rawSig;
-    this._updateMsg(msg);
-    this._setMsgStatus(msgId, 'signed');
-  }
-
-  /**
-   * Removes the metamaskId property from passed msgParams and returns a promise which resolves the updated msgParams
-   *
-   * @param {object} msgParams - The msgParams to modify
-   * @returns {Promise<object>} Promises the msgParams with the metamaskId property removed
-   */
-  async prepMsgForSigning(msgParams) {
-    delete msgParams.metamaskId;
-    delete msgParams.version;
-    return msgParams;
-  }
-
-  /**
-   * Sets a TypedMessage status to 'rejected' via a call to this._setMsgStatus.
-   *
-   * @param {number} msgId - The id of the TypedMessage to reject.
-   * @param reason
-   */
-  rejectMsg(msgId, reason = undefined) {
-    if (reason) {
-      const msg = this.getMsg(msgId);
-      this.metricsEvent({
-        event: reason,
-        category: EVENT.CATEGORIES.TRANSACTIONS,
-        properties: {
-          action: 'Sign Request',
-          version: msg.msgParams.version,
-          type: msg.type,
-        },
-      });
-    }
-    this._setMsgStatus(msgId, 'rejected');
-  }
-
-  /**
-   * Sets a TypedMessage status to 'errored' via a call to this._setMsgStatus.
-   *
-   * @param {number} msgId - The id of the TypedMessage to error
-   * @param error
-   */
-  errorMessage(msgId, error) {
-    const msg = this.getMsg(msgId);
-    msg.error = error;
-    this._updateMsg(msg);
-    this._setMsgStatus(msgId, 'errored');
-  }
-
-  /**
-   * Clears all unapproved messages from memory.
-   */
-  clearUnapproved() {
-    this.messages = this.messages.filter((msg) => msg.status !== 'unapproved');
-    this._saveMsgList();
-  }
-
-  //
-  // PRIVATE METHODS
-  //
-
-  /**
-   * Updates the status of a TypedMessage in this.messages via a call to this._updateMsg
-   *
-   * @private
-   * @param {number} msgId - The id of the TypedMessage to update.
-   * @param {string} status - The new status of the TypedMessage.
-   * @throws A 'TypedMessageManager - TypedMessage not found for id: "${msgId}".' if there is no TypedMessage
-   * in this.messages with an id equal to the passed msgId
-   * @fires An event with a name equal to `${msgId}:${status}`. The TypedMessage is also fired.
-   * @fires If status is 'rejected' or 'signed', an event with a name equal to `${msgId}:finished` is fired along
-   * with the TypedMessage
-   */
-  _setMsgStatus(msgId, status) {
-    const msg = this.getMsg(msgId);
-    if (!msg) {
-      throw new Error(
-        `TypedMessageManager - Message not found for id: "${msgId}".`,
-      );
-    }
-    msg.status = status;
-    this._updateMsg(msg);
-    this.emit(`${msgId}:${status}`, msg);
-    if (status === 'rejected' || status === 'signed' || status === 'errored') {
-      this.emit(`${msgId}:finished`, msg);
-    }
-  }
-
-  /**
-   * Sets a TypedMessage in this.messages to the passed TypedMessage if the ids are equal. Then saves the
-   * unapprovedTypedMsgs index to storage via this._saveMsgList
-   *
-   * @private
-   * @param {TypedMessage} msg - A TypedMessage that will replace an existing TypedMessage (with the same
-   * id) in this.messages
-   */
-  _updateMsg(msg) {
-    const index = this.messages.findIndex((message) => message.id === msg.id);
-    if (index !== -1) {
-      this.messages[index] = msg;
-    }
-    this._saveMsgList();
-  }
-
-  /**
-   * Saves the unapproved TypedMessages, and their count, to this.memStore
-   *
-   * @private
-   * @fires 'updateBadge'
-   */
-  _saveMsgList() {
-    const unapprovedTypedMessages = this.getUnapprovedMsgs();
-    const unapprovedTypedMessagesCount = Object.keys(
-      unapprovedTypedMessages,
-    ).length;
-    this.memStore.updateState({
-      unapprovedTypedMessages,
-      unapprovedTypedMessagesCount,
-    });
-    this.emit(METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE);
-  }
-}
diff --git a/app/scripts/lib/typed-message-manager.test.js b/app/scripts/lib/typed-message-manager.test.js
deleted file mode 100644
index b20b8ab09..000000000
--- a/app/scripts/lib/typed-message-manager.test.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import sinon from 'sinon';
-import { TransactionStatus } from '../../../shared/constants/transaction';
-import TypedMessageManager from './typed-message-manager';
-
-describe('Typed Message Manager', () => {
-  let typedMessageManager,
-    msgParamsV1,
-    msgParamsV3,
-    typedMsgs,
-    messages,
-    msgId,
-    numberMsgId;
-
-  const address = '0xc42edfcc21ed14dda456aa0756c153f7985d8813';
-
-  beforeEach(async () => {
-    typedMessageManager = new TypedMessageManager({
-      getCurrentChainId: sinon.fake.returns('0x1'),
-      metricsEvent: sinon.fake(),
-      securityProviderRequest: sinon.fake(),
-    });
-
-    msgParamsV1 = {
-      from: address,
-      data: [
-        { type: 'string', name: 'unit test', value: 'hello there' },
-        {
-          type: 'uint32',
-          name: 'A number, but not really a number',
-          value: '$$$',
-        },
-      ],
-    };
-
-    msgParamsV3 = {
-      from: address,
-      data: JSON.stringify({
-        types: {
-          EIP712Domain: [
-            { name: 'name', type: 'string' },
-            { name: 'version', type: 'string' },
-            { name: 'chainId', type: 'uint256' },
-            { name: 'verifyingContract', type: 'address' },
-          ],
-          Person: [
-            { name: 'name', type: 'string' },
-            { name: 'wallet', type: 'address' },
-          ],
-          Mail: [
-            { name: 'from', type: 'Person' },
-            { name: 'to', type: 'Person' },
-            { name: 'contents', type: 'string' },
-          ],
-        },
-        primaryType: 'Mail',
-        domain: {
-          name: 'Ether Mainl',
-          version: '1',
-          chainId: 1,
-          verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
-        },
-        message: {
-          from: {
-            name: 'Cow',
-            wallet: '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
-          },
-          to: {
-            name: 'Bob',
-            wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
-          },
-          contents: 'Hello, Bob!',
-        },
-      }),
-    };
-
-    await typedMessageManager.addUnapprovedMessage(msgParamsV3, null, 'V3');
-    typedMsgs = typedMessageManager.getUnapprovedMsgs();
-    messages = typedMessageManager.messages;
-    msgId = Object.keys(typedMsgs)[0];
-    messages[0].msgParams.metamaskId = parseInt(msgId, 10);
-    numberMsgId = parseInt(msgId, 10);
-  });
-
-  it('supports version 1 of signedTypedData', async () => {
-    await typedMessageManager.addUnapprovedMessage(msgParamsV1, null, 'V1');
-    expect(messages[messages.length - 1].msgParams.data).toStrictEqual(
-      msgParamsV1.data,
-    );
-  });
-
-  it('has params address', () => {
-    expect(typedMsgs[msgId].msgParams.from).toStrictEqual(address);
-  });
-
-  it('adds to unapproved messages and sets status to unapproved', () => {
-    expect(typedMsgs[msgId].status).toStrictEqual(TransactionStatus.unapproved);
-  });
-
-  it('validates params', async () => {
-    await expect(() => {
-      typedMessageManager.validateParams(messages[0].msgParams);
-    }).not.toThrow();
-  });
-
-  it('gets unapproved by id', () => {
-    const getMsg = typedMessageManager.getMsg(numberMsgId);
-    expect(getMsg.id).toStrictEqual(numberMsgId);
-  });
-
-  it('approves messages', async () => {
-    const messageMetaMaskId = messages[0].msgParams;
-    typedMessageManager.approveMessage(messageMetaMaskId);
-    expect(messages[0].status).toStrictEqual(TransactionStatus.approved);
-  });
-
-  it('sets msg status to signed and adds a raw sig to message details', () => {
-    typedMessageManager.setMsgStatusSigned(numberMsgId, 'raw sig');
-    expect(messages[0].status).toStrictEqual(TransactionStatus.signed);
-    expect(messages[0].rawSig).toStrictEqual('raw sig');
-  });
-
-  it('rejects message', () => {
-    typedMessageManager.rejectMsg(numberMsgId);
-    expect(messages[0].status).toStrictEqual(TransactionStatus.rejected);
-  });
-});
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c42770804..3e567c5d6 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -12,11 +12,7 @@ import {
 } from '@metamask/eth-keyring-controller';
 import createFilterMiddleware from 'eth-json-rpc-filters';
 import createSubscriptionManager from 'eth-json-rpc-filters/subscriptionManager';
-import {
-  errorCodes as rpcErrorCodes,
-  EthereumRpcError,
-  ethErrors,
-} from 'eth-rpc-errors';
+import { errorCodes as rpcErrorCodes, EthereumRpcError } from 'eth-rpc-errors';
 import { Mutex } from 'await-semaphore';
 import log from 'loglevel';
 import TrezorKeyring from 'eth-trezor-keyring';
@@ -149,11 +145,8 @@ import AlertController from './controllers/alert';
 import OnboardingController from './controllers/onboarding';
 import BackupController from './controllers/backup';
 import IncomingTransactionsController from './controllers/incoming-transactions';
-import MessageManager, { normalizeMsgData } from './lib/message-manager';
 import DecryptMessageManager from './lib/decrypt-message-manager';
 import EncryptionPublicKeyManager from './lib/encryption-public-key-manager';
-import PersonalMessageManager from './lib/personal-message-manager';
-import TypedMessageManager from './lib/typed-message-manager';
 import TransactionController from './controllers/transactions';
 import DetectTokensController from './controllers/detect-tokens';
 import SwapsController from './controllers/swaps';
@@ -164,6 +157,7 @@ import { segment } from './lib/segment';
 import createMetaRPCHandler from './lib/createMetaRPCHandler';
 import { previousValueComparator } from './lib/util';
 import createMetamaskMiddleware from './lib/createMetamaskMiddleware';
+import SignController from './controllers/sign';
 
 import {
   CaveatMutatorFactories,
@@ -1053,18 +1047,6 @@ export default class MetamaskController extends EventEmitter {
     });
 
     this.networkController.lookupNetwork();
-    this.messageManager = new MessageManager({
-      metricsEvent: this.metaMetricsController.trackEvent.bind(
-        this.metaMetricsController,
-      ),
-      securityProviderRequest: this.securityProviderRequest.bind(this),
-    });
-    this.personalMessageManager = new PersonalMessageManager({
-      metricsEvent: this.metaMetricsController.trackEvent.bind(
-        this.metaMetricsController,
-      ),
-      securityProviderRequest: this.securityProviderRequest.bind(this),
-    });
     this.decryptMessageManager = new DecryptMessageManager({
       metricsEvent: this.metaMetricsController.trackEvent.bind(
         this.metaMetricsController,
@@ -1075,12 +1057,19 @@ export default class MetamaskController extends EventEmitter {
         this.metaMetricsController,
       ),
     });
-    this.typedMessageManager = new TypedMessageManager({
-      getCurrentChainId: () =>
-        this.networkController.store.getState().provider.chainId,
-      metricsEvent: this.metaMetricsController.trackEvent.bind(
-        this.metaMetricsController,
-      ),
+
+    this.signController = new SignController({
+      messenger: this.controllerMessenger.getRestricted({
+        name: 'SignController',
+        allowedActions: [
+          `${this.approvalController.name}:addRequest`,
+          `${this.approvalController.name}:acceptRequest`,
+          `${this.approvalController.name}:rejectRequest`,
+        ],
+      }),
+      keyringController: this.keyringController,
+      preferencesController: this.preferencesController,
+      getState: this.getState.bind(this),
       securityProviderRequest: this.securityProviderRequest.bind(this),
     });
 
@@ -1136,10 +1125,8 @@ export default class MetamaskController extends EventEmitter {
     this.networkController.on(NETWORK_EVENTS.NETWORK_WILL_CHANGE, () => {
       this.txController.txStateManager.clearUnapprovedTxs();
       this.encryptionPublicKeyManager.clearUnapproved();
-      this.personalMessageManager.clearUnapproved();
-      this.typedMessageManager.clearUnapproved();
       this.decryptMessageManager.clearUnapproved();
-      this.messageManager.clearUnapproved();
+      this.signController.clearUnapproved();
     });
 
     this.metamaskMiddleware = createMetamaskMiddleware({
@@ -1167,11 +1154,22 @@ export default class MetamaskController extends EventEmitter {
       // tx signing
       processTransaction: this.newUnapprovedTransaction.bind(this),
       // msg signing
-      processEthSignMessage: this.newUnsignedMessage.bind(this),
-      processTypedMessage: this.newUnsignedTypedMessage.bind(this),
-      processTypedMessageV3: this.newUnsignedTypedMessage.bind(this),
-      processTypedMessageV4: this.newUnsignedTypedMessage.bind(this),
-      processPersonalMessage: this.newUnsignedPersonalMessage.bind(this),
+      processEthSignMessage: this.signController.newUnsignedMessage.bind(
+        this.signController,
+      ),
+      processTypedMessage: this.signController.newUnsignedTypedMessage.bind(
+        this.signController,
+      ),
+      processTypedMessageV3: this.signController.newUnsignedTypedMessage.bind(
+        this.signController,
+      ),
+      processTypedMessageV4: this.signController.newUnsignedTypedMessage.bind(
+        this.signController,
+      ),
+      processPersonalMessage:
+        this.signController.newUnsignedPersonalMessage.bind(
+          this.signController,
+        ),
       processDecryptMessage: this.newRequestDecryptMessage.bind(this),
       processEncryptionPublicKey: this.newRequestEncryptionPublicKey.bind(this),
       getPendingNonce: this.getPendingNonce.bind(this),
@@ -1195,11 +1193,9 @@ export default class MetamaskController extends EventEmitter {
       AccountTracker: this.accountTracker.store,
       TxController: this.txController.memStore,
       TokenRatesController: this.tokenRatesController,
-      MessageManager: this.messageManager.memStore,
-      PersonalMessageManager: this.personalMessageManager.memStore,
       DecryptMessageManager: this.decryptMessageManager.memStore,
       EncryptionPublicKeyManager: this.encryptionPublicKeyManager.memStore,
-      TypesMessageManager: this.typedMessageManager.memStore,
+      SignController: this.signController,
       SwapsController: this.swapsController.store,
       EnsController: this.ensController.store,
       ApprovalController: this.approvalController,
@@ -1277,11 +1273,9 @@ export default class MetamaskController extends EventEmitter {
     const resetMethods = [
       this.accountTracker.resetState,
       this.txController.resetState,
-      this.messageManager.resetState,
-      this.personalMessageManager.resetState,
       this.decryptMessageManager.resetState,
       this.encryptionPublicKeyManager.resetState,
-      this.typedMessageManager.resetState,
+      this.signController.resetState.bind(this.signController),
       this.swapsController.resetState,
       this.ensController.resetState,
       this.approvalController.clear.bind(this.approvalController),
@@ -1975,17 +1969,24 @@ export default class MetamaskController extends EventEmitter {
 
       updatePreviousGasParams:
         txController.updatePreviousGasParams.bind(txController),
-      // messageManager
-      signMessage: this.signMessage.bind(this),
-      cancelMessage: this.cancelMessage.bind(this),
 
-      // personalMessageManager
-      signPersonalMessage: this.signPersonalMessage.bind(this),
-      cancelPersonalMessage: this.cancelPersonalMessage.bind(this),
-
-      // typedMessageManager
-      signTypedMessage: this.signTypedMessage.bind(this),
-      cancelTypedMessage: this.cancelTypedMessage.bind(this),
+      // signController
+      signMessage: this.signController.signMessage.bind(this.signController),
+      cancelMessage: this.signController.cancelMessage.bind(
+        this.signController,
+      ),
+      signPersonalMessage: this.signController.signPersonalMessage.bind(
+        this.signController,
+      ),
+      cancelPersonalMessage: this.signController.cancelPersonalMessage.bind(
+        this.signController,
+      ),
+      signTypedMessage: this.signController.signTypedMessage.bind(
+        this.signController,
+      ),
+      cancelTypedMessage: this.signController.cancelTypedMessage.bind(
+        this.signController,
+      ),
 
       // decryptMessageManager
       decryptMessage: this.decryptMessage.bind(this),
@@ -3099,46 +3100,6 @@ export default class MetamaskController extends EventEmitter {
     return await this.txController.newUnapprovedTransaction(txParams, req);
   }
 
-  // eth_sign methods:
-
-  /**
-   * Called when a Dapp uses the eth_sign method, to request user approval.
-   * eth_sign is a pure signature of arbitrary data. It is on a deprecation
-   * path, since this data can be a transaction, or can leak private key
-   * information.
-   *
-   * @param {object} msgParams - The params passed to eth_sign.
-   * @param {object} [req] - The original request, containing the origin.
-   */
-  async newUnsignedMessage(msgParams, req) {
-    const { disabledRpcMethodPreferences } =
-      this.preferencesController.store.getState();
-    const { eth_sign } = disabledRpcMethodPreferences; // eslint-disable-line camelcase
-    const data = normalizeMsgData(msgParams.data);
-    let promise;
-
-    // eslint-disable-next-line camelcase
-    if (!eth_sign) {
-      throw ethErrors.rpc.methodNotFound(
-        'eth_sign has been disabled. You must enable it in the advanced settings',
-      );
-    }
-
-    // 64 hex + "0x" at the beginning
-    // This is needed because Ethereum's EcSign works only on 32 byte numbers
-    // For 67 length see: https://github.com/MetaMask/metamask-extension/pull/12679/files#r749479607
-    if (data.length === 66 || data.length === 67) {
-      promise = this.messageManager.addUnapprovedMessageAsync(msgParams, req);
-      this.sendUpdate();
-      this.opts.showUserConfirmation();
-    } else {
-      throw ethErrors.rpc.invalidParams(
-        'eth_sign requires 32 byte message hash',
-      );
-    }
-    return await promise;
-  }
-
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   /**
    * Gets an "app key" corresponding to an Ethereum address. An app key is more
@@ -3165,105 +3126,6 @@ export default class MetamaskController extends EventEmitter {
   }
   ///: END:ONLY_INCLUDE_IN
 
-  /**
-   * Signifies user intent to complete an eth_sign method.
-   *
-   * @param {object} msgParams - The params passed to eth_call.
-   * @returns {Promise<object>} Full state update.
-   */
-  async signMessage(msgParams) {
-    log.info('MetaMaskController - signMessage');
-    const msgId = msgParams.metamaskId;
-    try {
-      // sets the status op the message to 'approved'
-      // and removes the metamaskId for signing
-      const cleanMsgParams = await this.messageManager.approveMessage(
-        msgParams,
-      );
-      const rawSig = await this.keyringController.signMessage(cleanMsgParams);
-      this.messageManager.setMsgStatusSigned(msgId, rawSig);
-      return this.getState();
-    } catch (error) {
-      log.info('MetaMaskController - eth_sign failed', error);
-      this.messageManager.errorMessage(msgId, error);
-      throw error;
-    }
-  }
-
-  /**
-   * Used to cancel a message submitted via eth_sign.
-   *
-   * @param {string} msgId - The id of the message to cancel.
-   */
-  cancelMessage(msgId) {
-    const { messageManager } = this;
-    messageManager.rejectMsg(msgId);
-    return this.getState();
-  }
-
-  // personal_sign methods:
-
-  /**
-   * Called when a dapp uses the personal_sign method.
-   * This is identical to the Geth eth_sign method, and may eventually replace
-   * eth_sign.
-   *
-   * We currently define our eth_sign and personal_sign mostly for legacy Dapps.
-   *
-   * @param {object} msgParams - The params of the message to sign & return to the Dapp.
-   * @param {object} [req] - The original request, containing the origin.
-   */
-  async newUnsignedPersonalMessage(msgParams, req) {
-    const promise = this.personalMessageManager.addUnapprovedMessageAsync(
-      msgParams,
-      req,
-    );
-    this.sendUpdate();
-    this.opts.showUserConfirmation();
-    return promise;
-  }
-
-  /**
-   * Signifies a user's approval to sign a personal_sign message in queue.
-   * Triggers signing, and the callback function from newUnsignedPersonalMessage.
-   *
-   * @param {object} msgParams - The params of the message to sign & return to the Dapp.
-   * @returns {Promise<object>} A full state update.
-   */
-  async signPersonalMessage(msgParams) {
-    log.info('MetaMaskController - signPersonalMessage');
-    const msgId = msgParams.metamaskId;
-    // sets the status op the message to 'approved'
-    // and removes the metamaskId for signing
-    try {
-      const cleanMsgParams = await this.personalMessageManager.approveMessage(
-        msgParams,
-      );
-      const rawSig = await this.keyringController.signPersonalMessage(
-        cleanMsgParams,
-      );
-      // tells the listener that the message has been signed
-      // and can be returned to the dapp
-      this.personalMessageManager.setMsgStatusSigned(msgId, rawSig);
-      return this.getState();
-    } catch (error) {
-      log.info('MetaMaskController - eth_personalSign failed', error);
-      this.personalMessageManager.errorMessage(msgId, error);
-      throw error;
-    }
-  }
-
-  /**
-   * Used to cancel a personal_sign type message.
-   *
-   * @param {string} msgId - The ID of the message to cancel.
-   */
-  cancelPersonalMessage(msgId) {
-    const messageManager = this.personalMessageManager;
-    messageManager.rejectMsg(msgId);
-    return this.getState();
-  }
-
   // eth_decrypt methods
 
   /**
@@ -3456,74 +3318,6 @@ export default class MetamaskController extends EventEmitter {
     return this.getState();
   }
 
-  // eth_signTypedData methods
-
-  /**
-   * Called when a dapp uses the eth_signTypedData method, per EIP 712.
-   *
-   * @param {object} msgParams - The params passed to eth_signTypedData.
-   * @param {object} [req] - The original request, containing the origin.
-   * @param version
-   */
-  async newUnsignedTypedMessage(msgParams, req, version) {
-    const promise = this.typedMessageManager.addUnapprovedMessageAsync(
-      msgParams,
-      req,
-      version,
-    );
-    this.sendUpdate();
-    this.opts.showUserConfirmation();
-    return promise;
-  }
-
-  /**
-   * The method for a user approving a call to eth_signTypedData, per EIP 712.
-   * Triggers the callback in newUnsignedTypedMessage.
-   *
-   * @param {object} msgParams - The params passed to eth_signTypedData.
-   * @returns {object} Full state update.
-   */
-  async signTypedMessage(msgParams) {
-    log.info('MetaMaskController - eth_signTypedData');
-    const msgId = msgParams.metamaskId;
-    const { version } = msgParams;
-    try {
-      const cleanMsgParams = await this.typedMessageManager.approveMessage(
-        msgParams,
-      );
-
-      // For some reason every version after V1 used stringified params.
-      if (version !== 'V1') {
-        // But we don't have to require that. We can stop suggesting it now:
-        if (typeof cleanMsgParams.data === 'string') {
-          cleanMsgParams.data = JSON.parse(cleanMsgParams.data);
-        }
-      }
-
-      const signature = await this.keyringController.signTypedMessage(
-        cleanMsgParams,
-        { version },
-      );
-      this.typedMessageManager.setMsgStatusSigned(msgId, signature);
-      return this.getState();
-    } catch (error) {
-      log.info('MetaMaskController - eth_signTypedData failed.', error);
-      this.typedMessageManager.errorMessage(msgId, error);
-      throw error;
-    }
-  }
-
-  /**
-   * Used to cancel a eth_signTypedData type message.
-   *
-   * @param {string} msgId - The ID of the message to cancel.
-   */
-  cancelTypedMessage(msgId) {
-    const messageManager = this.typedMessageManager;
-    messageManager.rejectMsg(msgId);
-    return this.getState();
-  }
-
   /**
    * @returns {boolean} true if the keyring type supports EIP-1559
    */
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 43d0e5b20..03e335a26 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -897,177 +897,6 @@ describe('MetaMaskController', function () {
     });
   });
 
-  describe('#newUnsignedMessage', function () {
-    let msgParams, metamaskMsgs, messages, msgId;
-
-    const address = '0xc42edfcc21ed14dda456aa0756c153f7985d8813';
-    const data =
-      '0x0000000000000000000000000000000000000043727970746f6b697474696573';
-
-    beforeEach(async function () {
-      sandbox.stub(metamaskController, 'getBalance');
-      metamaskController.getBalance.callsFake(() => {
-        return Promise.resolve('0x0');
-      });
-
-      await metamaskController.createNewVaultAndRestore(
-        'foobar1337',
-        TEST_SEED_ALT,
-      );
-
-      msgParams = {
-        from: address,
-        data,
-      };
-
-      metamaskController.preferencesController.setDisabledRpcMethodPreference(
-        'eth_sign',
-        true,
-      );
-      const promise = metamaskController.newUnsignedMessage(msgParams);
-      // handle the promise so it doesn't throw an unhandledRejection
-      promise.then(noop).catch(noop);
-
-      metamaskMsgs = metamaskController.messageManager.getUnapprovedMsgs();
-      messages = metamaskController.messageManager.messages;
-      msgId = Object.keys(metamaskMsgs)[0];
-      messages[0].msgParams.metamaskId = parseInt(msgId, 10);
-    });
-
-    it('persists address from msg params', function () {
-      assert.equal(metamaskMsgs[msgId].msgParams.from, address);
-    });
-
-    it('persists data from msg params', function () {
-      assert.equal(metamaskMsgs[msgId].msgParams.data, data);
-    });
-
-    it('sets the status to unapproved', function () {
-      assert.equal(metamaskMsgs[msgId].status, TransactionStatus.unapproved);
-    });
-
-    it('sets the type to eth_sign', function () {
-      assert.equal(metamaskMsgs[msgId].type, 'eth_sign');
-    });
-
-    it('rejects the message', function () {
-      const msgIdInt = parseInt(msgId, 10);
-      metamaskController.cancelMessage(msgIdInt, noop);
-      assert.equal(messages[0].status, TransactionStatus.rejected);
-    });
-
-    it('checks message length', async function () {
-      msgParams = {
-        from: address,
-        data: '0xDEADBEEF',
-      };
-
-      try {
-        await metamaskController.newUnsignedMessage(msgParams);
-      } catch (error) {
-        assert.equal(error.message, 'eth_sign requires 32 byte message hash');
-      }
-    });
-
-    it('errors when signing a message', async function () {
-      try {
-        await metamaskController.signMessage(messages[0].msgParams);
-      } catch (error) {
-        assert.equal(
-          error.message,
-          'Expected message to be an Uint8Array with length 32',
-        );
-      }
-    });
-  });
-
-  describe('#newUnsignedPersonalMessage', function () {
-    let msgParams, metamaskPersonalMsgs, personalMessages, msgId;
-
-    const address = '0xc42edfcc21ed14dda456aa0756c153f7985d8813';
-    const data = '0x43727970746f6b697474696573';
-
-    beforeEach(async function () {
-      sandbox.stub(metamaskController, 'getBalance');
-      metamaskController.getBalance.callsFake(() => {
-        return Promise.resolve('0x0');
-      });
-
-      await metamaskController.createNewVaultAndRestore(
-        'foobar1337',
-        TEST_SEED_ALT,
-      );
-
-      msgParams = {
-        from: address,
-        data,
-      };
-
-      const promise = metamaskController.newUnsignedPersonalMessage(msgParams);
-      // handle the promise so it doesn't throw an unhandledRejection
-      promise.then(noop).catch(noop);
-
-      metamaskPersonalMsgs =
-        metamaskController.personalMessageManager.getUnapprovedMsgs();
-      personalMessages = metamaskController.personalMessageManager.messages;
-      msgId = Object.keys(metamaskPersonalMsgs)[0];
-      personalMessages[0].msgParams.metamaskId = parseInt(msgId, 10);
-    });
-
-    it('errors with no from in msgParams', async function () {
-      try {
-        await metamaskController.newUnsignedPersonalMessage({
-          data,
-        });
-        assert.fail('should have thrown');
-      } catch (error) {
-        assert.equal(
-          error.message,
-          'MetaMask Message Signature: from field is required.',
-        );
-      }
-    });
-
-    it('persists address from msg params', function () {
-      assert.equal(metamaskPersonalMsgs[msgId].msgParams.from, address);
-    });
-
-    it('persists data from msg params', function () {
-      assert.equal(metamaskPersonalMsgs[msgId].msgParams.data, data);
-    });
-
-    it('sets the status to unapproved', function () {
-      assert.equal(
-        metamaskPersonalMsgs[msgId].status,
-        TransactionStatus.unapproved,
-      );
-    });
-
-    it('sets the type to personal_sign', function () {
-      assert.equal(metamaskPersonalMsgs[msgId].type, 'personal_sign');
-    });
-
-    it('rejects the message', function () {
-      const msgIdInt = parseInt(msgId, 10);
-      metamaskController.cancelPersonalMessage(msgIdInt, noop);
-      assert.equal(personalMessages[0].status, TransactionStatus.rejected);
-    });
-
-    it('errors when signing a message', async function () {
-      await metamaskController.signPersonalMessage(
-        personalMessages[0].msgParams,
-      );
-      assert.equal(
-        metamaskPersonalMsgs[msgId].status,
-        TransactionStatus.signed,
-      );
-      assert.equal(
-        metamaskPersonalMsgs[msgId].rawSig,
-        '0x6a1b65e2b8ed53cf398a769fad24738f9fbe29841fe6854e226953542c4b6a173473cb152b6b1ae5f06d601d45dd699a129b0a8ca84e78b423031db5baa734741b',
-      );
-    });
-  });
-
   describe('#setupUntrustedCommunication', function () {
     const mockTxParams = { from: TEST_ADDRESS };
 
diff --git a/jest.config.js b/jest.config.js
index 94daa4971..a16469ce1 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -3,6 +3,7 @@ module.exports = {
     '<rootDir>/app/scripts/constants/error-utils.js',
     '<rootDir>/app/scripts/controllers/network/**/*.js',
     '<rootDir>/app/scripts/controllers/permissions/**/*.js',
+    '<rootDir>/app/scripts/controllers/sign.ts',
     '<rootDir>/app/scripts/flask/**/*.js',
     '<rootDir>/app/scripts/lib/**/*.js',
     '<rootDir>/app/scripts/lib/createRPCMethodTrackingMiddleware.js',
@@ -39,6 +40,7 @@ module.exports = {
     '<rootDir>/app/scripts/controllers/app-state.test.js',
     '<rootDir>/app/scripts/controllers/network/**/*.test.js',
     '<rootDir>/app/scripts/controllers/permissions/**/*.test.js',
+    '<rootDir>/app/scripts/controllers/sign.test.ts',
     '<rootDir>/app/scripts/flask/**/*.test.js',
     '<rootDir>/app/scripts/lib/**/*.test.js',
     '<rootDir>/app/scripts/lib/**/*.test.ts',
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 116df79f1..17687c27b 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1302,6 +1302,42 @@
         "@metamask/logo>gl-vec3": true
       }
     },
+    "@metamask/message-manager": {
+      "packages": {
+        "@metamask/message-manager>@metamask/base-controller": true,
+        "@metamask/message-manager>@metamask/controller-utils": true,
+        "@metamask/message-manager>jsonschema": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "uuid": true
+      }
+    },
+    "@metamask/message-manager>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/message-manager>@metamask/controller-utils": {
+      "globals": {
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true,
+        "ethereumjs-util": true,
+        "ethjs>ethjs-unit": true
+      }
+    },
+    "@metamask/message-manager>jsonschema": {
+      "packages": {
+        "browserify>url": true
+      }
+    },
     "@metamask/notification-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -3588,11 +3624,6 @@
         "readable-stream": true
       }
     },
-    "jsonschema": {
-      "packages": {
-        "browserify>url": true
-      }
-    },
     "koa>is-generator-function>has-tostringtag": {
       "packages": {
         "string.prototype.matchall>has-symbols": true
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index ac03c7631..ceadebd90 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1356,6 +1356,42 @@
         "@metamask/logo>gl-vec3": true
       }
     },
+    "@metamask/message-manager": {
+      "packages": {
+        "@metamask/message-manager>@metamask/base-controller": true,
+        "@metamask/message-manager>@metamask/controller-utils": true,
+        "@metamask/message-manager>jsonschema": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "uuid": true
+      }
+    },
+    "@metamask/message-manager>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/message-manager>@metamask/controller-utils": {
+      "globals": {
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true,
+        "ethereumjs-util": true,
+        "ethjs>ethjs-unit": true
+      }
+    },
+    "@metamask/message-manager>jsonschema": {
+      "packages": {
+        "browserify>url": true
+      }
+    },
     "@metamask/notification-controller": {
       "packages": {
         "@metamask/controller-utils": true,
@@ -4029,11 +4065,6 @@
         "readable-stream": true
       }
     },
-    "jsonschema": {
-      "packages": {
-        "browserify>url": true
-      }
-    },
     "koa>is-generator-function>has-tostringtag": {
       "packages": {
         "string.prototype.matchall>has-symbols": true
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index ac03c7631..ceadebd90 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1356,6 +1356,42 @@
         "@metamask/logo>gl-vec3": true
       }
     },
+    "@metamask/message-manager": {
+      "packages": {
+        "@metamask/message-manager>@metamask/base-controller": true,
+        "@metamask/message-manager>@metamask/controller-utils": true,
+        "@metamask/message-manager>jsonschema": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "uuid": true
+      }
+    },
+    "@metamask/message-manager>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/message-manager>@metamask/controller-utils": {
+      "globals": {
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true,
+        "ethereumjs-util": true,
+        "ethjs>ethjs-unit": true
+      }
+    },
+    "@metamask/message-manager>jsonschema": {
+      "packages": {
+        "browserify>url": true
+      }
+    },
     "@metamask/notification-controller": {
       "packages": {
         "@metamask/controller-utils": true,
@@ -4029,11 +4065,6 @@
         "readable-stream": true
       }
     },
-    "jsonschema": {
-      "packages": {
-        "browserify>url": true
-      }
-    },
     "koa>is-generator-function>has-tostringtag": {
       "packages": {
         "string.prototype.matchall>has-symbols": true
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 116df79f1..17687c27b 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1302,6 +1302,42 @@
         "@metamask/logo>gl-vec3": true
       }
     },
+    "@metamask/message-manager": {
+      "packages": {
+        "@metamask/message-manager>@metamask/base-controller": true,
+        "@metamask/message-manager>@metamask/controller-utils": true,
+        "@metamask/message-manager>jsonschema": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "uuid": true
+      }
+    },
+    "@metamask/message-manager>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/message-manager>@metamask/controller-utils": {
+      "globals": {
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true,
+        "ethereumjs-util": true,
+        "ethjs>ethjs-unit": true
+      }
+    },
+    "@metamask/message-manager>jsonschema": {
+      "packages": {
+        "browserify>url": true
+      }
+    },
     "@metamask/notification-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -3588,11 +3624,6 @@
         "readable-stream": true
       }
     },
-    "jsonschema": {
-      "packages": {
-        "browserify>url": true
-      }
-    },
     "koa>is-generator-function>has-tostringtag": {
       "packages": {
         "string.prototype.matchall>has-symbols": true
diff --git a/package.json b/package.json
index d57328cb5..62e4af2ab 100644
--- a/package.json
+++ b/package.json
@@ -242,6 +242,7 @@
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/key-tree": "^7.0.0",
     "@metamask/logo": "^3.1.1",
+    "@metamask/message-manager": "^2.0.0",
     "@metamask/metamask-eth-abis": "^3.0.0",
     "@metamask/notification-controller": "^1.0.0",
     "@metamask/obs-store": "^5.0.0",
@@ -310,7 +311,6 @@
     "jest-junit": "^14.0.1",
     "json-rpc-engine": "^6.1.0",
     "json-rpc-middleware-stream": "^4.2.1",
-    "jsonschema": "^1.2.4",
     "labeled-stream-splicer": "^2.0.2",
     "localforage": "^1.9.0",
     "lodash": "^4.17.21",
diff --git a/types/eth-keyring-controller.d.ts b/types/eth-keyring-controller.d.ts
new file mode 100644
index 000000000..86d8ffc6b
--- /dev/null
+++ b/types/eth-keyring-controller.d.ts
@@ -0,0 +1,9 @@
+declare module '@metamask/eth-keyring-controller' {
+  export class KeyringController {
+    signMessage: (...any) => any;
+
+    signPersonalMessage: (...any) => any;
+
+    signTypedMessage: (...any) => any;
+  }
+}
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index 105ff34c8..cac4f79a3 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -45,6 +45,10 @@ describe('Actions', () => {
     background = sinon.createStubInstance(MetaMaskController, {
       getState: sinon.stub().callsFake((cb) => cb(null, baseMockState)),
     });
+
+    background.signMessage = sinon.stub();
+    background.signPersonalMessage = sinon.stub();
+    background.signTypedMessage = sinon.stub();
   });
 
   describe('#tryUnlockMetamask', () => {
diff --git a/yarn.lock b/yarn.lock
index 11acd8dea..3f1224f76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4026,6 +4026,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/message-manager@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@metamask/message-manager@npm:2.0.0"
+  dependencies:
+    "@metamask/base-controller": ^2.0.0
+    "@metamask/controller-utils": ^3.0.0
+    "@types/uuid": ^8.3.0
+    eth-sig-util: ^3.0.0
+    ethereumjs-util: ^7.0.10
+    jsonschema: ^1.2.4
+    uuid: ^8.3.2
+  checksum: f130b5c58fbbb5ccd69da32cfa43839a09dec906974c6d0f6e2d46f15d1a872c564b0c880aac2979b7ffc8d00bcf328bf1989cb133cc41bc612e1e6e16ef9ef5
+  languageName: node
+  linkType: hard
+
 "@metamask/metamask-eth-abis@npm:3.0.0, @metamask/metamask-eth-abis@npm:^3.0.0":
   version: 3.0.0
   resolution: "@metamask/metamask-eth-abis@npm:3.0.0"
@@ -24282,6 +24297,7 @@ __metadata:
     "@metamask/jazzicon": ^2.0.0
     "@metamask/key-tree": ^7.0.0
     "@metamask/logo": ^3.1.1
+    "@metamask/message-manager": ^2.0.0
     "@metamask/metamask-eth-abis": ^3.0.0
     "@metamask/notification-controller": ^1.0.0
     "@metamask/obs-store": ^5.0.0
@@ -24460,7 +24476,6 @@ __metadata:
     jsdom: ^11.2.0
     json-rpc-engine: ^6.1.0
     json-rpc-middleware-stream: ^4.2.1
-    jsonschema: ^1.2.4
     junit-report-merger: ^4.0.0
     koa: ^2.7.0
     labeled-stream-splicer: ^2.0.2

From 839d6a59ed1e826cb110c8da95da66e374433d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Oliv=C3=A9?= <albertolivecorbella@gmail.com>
Date: Mon, 20 Mar 2023 15:39:29 +0100
Subject: [PATCH 029/129] =?UTF-8?q?[MMI]=C2=A0Added=20mmi=20code=20fencing?=
 =?UTF-8?q?=20in=20onboarding=20flow=20(#17880)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* added mmi code fencing

* Fixed code fencing issue
---
 .../onboarding-flow-switch/onboarding-flow-switch.js          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js b/ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js
index 24c8310ed..33f684c6e 100644
--- a/ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js
+++ b/ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js
@@ -9,7 +9,7 @@ import {
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   ONBOARDING_EXPERIMENTAL_AREA, // eslint-disable-line no-unused-vars
   ///: END:ONLY_INCLUDE_IN
-  ///: BEGIN:ONLY_INCLUDE_IN(main,beta)
+  ///: BEGIN:ONLY_INCLUDE_IN(main,beta,mmi)
   ONBOARDING_WELCOME_ROUTE, // eslint-disable-line no-unused-vars
   ///: END:ONLY_INCLUDE_IN
 } from '../../../helpers/constants/routes';
@@ -45,7 +45,7 @@ export default function OnboardingFlowSwitch() {
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     redirect = <Redirect to={{ pathname: ONBOARDING_EXPERIMENTAL_AREA }} />;
     ///: END:ONLY_INCLUDE_IN
-    ///: BEGIN:ONLY_INCLUDE_IN(main,beta)
+    ///: BEGIN:ONLY_INCLUDE_IN(main,beta,mmi)
     redirect = <Redirect to={{ pathname: ONBOARDING_WELCOME_ROUTE }} />;
     ///: END:ONLY_INCLUDE_IN
     /* eslint-enable prefer-const */

From f8fd9cde716c93f012aae4405832a1f2a99d3125 Mon Sep 17 00:00:00 2001
From: Guillaume Roux <guillaumeroux123@gmail.com>
Date: Mon, 20 Mar 2023 17:12:58 +0100
Subject: [PATCH 030/129] [FLASK] Remove permission footer in snap
 install/update flow (#18240)

---
 .../permissions-connect/flask/snap-install/snap-install.js   | 4 ----
 .../permissions-connect/flask/snap-result/snap-result.js     | 5 -----
 .../permissions-connect/flask/snap-update/snap-update.js     | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/ui/pages/permissions-connect/flask/snap-install/snap-install.js b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
index f8ee51949..2fbc724d7 100644
--- a/ui/pages/permissions-connect/flask/snap-install/snap-install.js
+++ b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React, { useCallback, useState } from 'react';
 import { PageContainerFooter } from '../../../../components/ui/page-container';
 import PermissionsConnectPermissionList from '../../../../components/app/permissions-connect-permission-list';
-import PermissionsConnectFooter from '../../../../components/app/permissions-connect-footer';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import SnapInstallWarning from '../../../../components/app/flask/snap-install-warning';
 import Box from '../../../../components/ui/box/box';
@@ -155,9 +154,6 @@ export default function SnapInstall({
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <Box className="snap-install__footer--no-source-code" paddingTop={4}>
-          <PermissionsConnectFooter />
-        </Box>
         <PageContainerFooter
           cancelButtonType="default"
           hideCancel={hasError}
diff --git a/ui/pages/permissions-connect/flask/snap-result/snap-result.js b/ui/pages/permissions-connect/flask/snap-result/snap-result.js
index 68adb7993..ffb55e5e1 100644
--- a/ui/pages/permissions-connect/flask/snap-result/snap-result.js
+++ b/ui/pages/permissions-connect/flask/snap-result/snap-result.js
@@ -1,8 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { useCallback } from 'react';
 import { PageContainerFooter } from '../../../../components/ui/page-container';
-
-import PermissionsConnectFooter from '../../../../components/app/permissions-connect-footer';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 
 import Box from '../../../../components/ui/box/box';
@@ -100,9 +98,6 @@ export default function SnapResult({
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <Box className="snap-install__footer--no-source-code" paddingTop={4}>
-          <PermissionsConnectFooter />
-        </Box>
         <PageContainerFooter
           hideCancel
           disabled={isLoading}
diff --git a/ui/pages/permissions-connect/flask/snap-update/snap-update.js b/ui/pages/permissions-connect/flask/snap-update/snap-update.js
index 87b56f262..6c6110926 100644
--- a/ui/pages/permissions-connect/flask/snap-update/snap-update.js
+++ b/ui/pages/permissions-connect/flask/snap-update/snap-update.js
@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { useCallback, useState } from 'react';
 import { PageContainerFooter } from '../../../../components/ui/page-container';
-import PermissionsConnectFooter from '../../../../components/app/permissions-connect-footer';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import SnapInstallWarning from '../../../../components/app/flask/snap-install-warning';
 import Box from '../../../../components/ui/box/box';
@@ -163,9 +162,6 @@ export default function SnapUpdate({
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <Box className="snap-update__footer--no-source-code" paddingTop={4}>
-          <PermissionsConnectFooter />
-        </Box>
         <PageContainerFooter
           cancelButtonType="default"
           hideCancel={hasError}

From bf851a56a44a606d14716bbf0e4d042be04cf490 Mon Sep 17 00:00:00 2001
From: Elliot Winkler <elliot.winkler@gmail.com>
Date: Mon, 20 Mar 2023 10:50:52 -0600
Subject: [PATCH 031/129] Align network client tests with core repo (#17904)

When the network client tests in this repo were copied over to the core
repo, some alterations were made. This commit copies them back to this
repo so that the two test suites are easier to compare to each other.
Changes include:

* Extracting `testsFor*` functions (functions that bundle similar tests
  together) into separate files
* Reordering the tests defined in
  `testsForRpcMethodsThatCheckForBlockHashInResponse`
* Reordering the set of RPC methods listed in `shared-tests.js`
* Reordering the type definitions defined in `shared-tests.js` to be
  closer to the functions that use them
* Updating the tests defined in `testsForRpcMethodSupportingBlockParam`
  so that when they make requests they pass params, even if it's just an
  empty array
---
 .../block-hash-in-response.js                 |  272 ++
 .../network/provider-api-tests/block-param.js | 2059 ++++++++++
 .../network/provider-api-tests/helpers.js     |  218 +-
 .../provider-api-tests/no-block-param.js      |  968 +++++
 .../not-handled-by-middleware.js              |   51 +
 .../provider-api-tests/shared-tests.js        | 3480 +----------------
 6 files changed, 3590 insertions(+), 3458 deletions(-)
 create mode 100644 app/scripts/controllers/network/provider-api-tests/block-hash-in-response.js
 create mode 100644 app/scripts/controllers/network/provider-api-tests/block-param.js
 create mode 100644 app/scripts/controllers/network/provider-api-tests/no-block-param.js
 create mode 100644 app/scripts/controllers/network/provider-api-tests/not-handled-by-middleware.js

diff --git a/app/scripts/controllers/network/provider-api-tests/block-hash-in-response.js b/app/scripts/controllers/network/provider-api-tests/block-hash-in-response.js
new file mode 100644
index 000000000..c1778f628
--- /dev/null
+++ b/app/scripts/controllers/network/provider-api-tests/block-hash-in-response.js
@@ -0,0 +1,272 @@
+/* eslint-disable jest/require-top-level-describe, jest/no-export */
+
+import { withMockedCommunications, withNetworkClient } from './helpers';
+
+/**
+ * Defines tests which exercise the behavior exhibited by an RPC method that
+ * use `blockHash` in the response data to determine whether the response is
+ * cacheable.
+ *
+ * @param method - The name of the RPC method under test.
+ * @param additionalArgs - Additional arguments.
+ * @param additionalArgs.numberOfParameters - The number of parameters supported
+ * by the method under test.
+ * @param additionalArgs.providerType - The type of provider being tested;
+ * either `infura` or `custom` (default: "infura").
+ */
+export function testsForRpcMethodsThatCheckForBlockHashInResponse(
+  method,
+  { numberOfParameters, providerType },
+) {
+  if (providerType !== 'infura' && providerType !== 'custom') {
+    throw new Error(
+      `providerType must be either "infura" or "custom", was "${providerType}" instead`,
+    );
+  }
+
+  it('does not hit the RPC endpoint more than once for identical requests and it has a valid blockHash', async () => {
+    const requests = [{ method }, { method }];
+    const mockResult = { blockHash: '0x1' };
+
+    await withMockedCommunications({ providerType }, async (comms) => {
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      comms.mockRpcCall({
+        request: requests[0],
+        response: { result: mockResult },
+      });
+
+      const results = await withNetworkClient(
+        { providerType },
+        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+      );
+
+      expect(results).toStrictEqual([mockResult, mockResult]);
+    });
+  });
+
+  it('hits the RPC endpoint and does not reuse the result of a previous request if the latest block number was updated since', async () => {
+    const requests = [{ method }, { method }];
+    const mockResults = [{ blockHash: '0x100' }, { blockHash: '0x200' }];
+
+    await withMockedCommunications({ providerType }, async (comms) => {
+      // Note that we have to mock these requests in a specific order. The
+      // first block tracker request occurs because of the first RPC
+      // request. The second block tracker request, however, does not occur
+      // because of the second RPC request, but rather because we call
+      // `clock.runAll()` below.
+      comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' });
+      comms.mockRpcCall({
+        request: requests[0],
+        response: { result: mockResults[0] },
+      });
+      comms.mockNextBlockTrackerRequest({ blockNumber: '0x2' });
+      comms.mockRpcCall({
+        request: requests[1],
+        response: { result: mockResults[1] },
+      });
+
+      const results = await withNetworkClient(
+        { providerType },
+        async (client) => {
+          const firstResult = await client.makeRpcCall(requests[0]);
+          // Proceed to the next iteration of the block tracker so that a new
+          // block is fetched and the current block is updated.
+          client.clock.runAll();
+          const secondResult = await client.makeRpcCall(requests[1]);
+          return [firstResult, secondResult];
+        },
+      );
+
+      expect(results).toStrictEqual(mockResults);
+    });
+  });
+
+  it('does not reuse the result of a previous request if result.blockHash was null', async () => {
+    const requests = [{ method }, { method }];
+    const mockResults = [
+      { blockHash: null, extra: 'some value' },
+      { blockHash: '0x100', extra: 'some other value' },
+    ];
+
+    await withMockedCommunications({ providerType }, async (comms) => {
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      comms.mockRpcCall({
+        request: requests[0],
+        response: { result: mockResults[0] },
+      });
+      comms.mockRpcCall({
+        request: requests[1],
+        response: { result: mockResults[1] },
+      });
+
+      const results = await withNetworkClient(
+        { providerType },
+        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+      );
+
+      expect(results).toStrictEqual(mockResults);
+    });
+  });
+
+  it('does not reuse the result of a previous request if result.blockHash was undefined', async () => {
+    const requests = [{ method }, { method }];
+    const mockResults = [
+      { extra: 'some value' },
+      { blockHash: '0x100', extra: 'some other value' },
+    ];
+
+    await withMockedCommunications({ providerType }, async (comms) => {
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      comms.mockRpcCall({
+        request: requests[0],
+        response: { result: mockResults[0] },
+      });
+      comms.mockRpcCall({
+        request: requests[1],
+        response: { result: mockResults[1] },
+      });
+
+      const results = await withNetworkClient(
+        { providerType },
+        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+      );
+
+      expect(results).toStrictEqual(mockResults);
+    });
+  });
+
+  it('does not reuse the result of a previous request if result.blockHash was "0x0000000000000000000000000000000000000000000000000000000000000000"', async () => {
+    const requests = [{ method }, { method }];
+    const mockResults = [
+      {
+        blockHash:
+          '0x0000000000000000000000000000000000000000000000000000000000000000',
+        extra: 'some value',
+      },
+      { blockHash: '0x100', extra: 'some other value' },
+    ];
+
+    await withMockedCommunications({ providerType }, async (comms) => {
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      comms.mockRpcCall({
+        request: requests[0],
+        response: { result: mockResults[0] },
+      });
+      comms.mockRpcCall({
+        request: requests[1],
+        response: { result: mockResults[1] },
+      });
+
+      const results = await withNetworkClient(
+        { providerType },
+        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+      );
+
+      expect(results).toStrictEqual(mockResults);
+    });
+  });
+
+  for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
+    it(`does not retry an empty response of "${emptyValue}"`, async () => {
+      const request = { method };
+      const mockResult = emptyValue;
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          response: { result: mockResult },
+        });
+
+        const result = await withNetworkClient(
+          { providerType },
+          ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        expect(result).toStrictEqual(mockResult);
+      });
+    });
+
+    it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
+      const requests = [{ method }, { method }];
+      const mockResults = [emptyValue, { blockHash: '0x100' }];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request: requests[0],
+          response: { result: mockResults[0] },
+        });
+        comms.mockRpcCall({
+          request: requests[1],
+          response: { result: mockResults[1] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+        );
+
+        expect(results).toStrictEqual(mockResults);
+      });
+    });
+  }
+
+  for (const paramIndex of [...Array(numberOfParameters).keys()]) {
+    it(`does not reuse the result of a previous request with a valid blockHash if parameter at index "${paramIndex}" differs`, async () => {
+      const firstMockParams = [
+        ...new Array(numberOfParameters).fill('some value'),
+      ];
+      const secondMockParams = firstMockParams.slice();
+      secondMockParams[paramIndex] = 'another value';
+      const requests = [
+        {
+          method,
+          params: firstMockParams,
+        },
+        { method, params: secondMockParams },
+      ];
+      const mockResults = [{ blockHash: '0x100' }, { blockHash: '0x200' }];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request: requests[0],
+          response: { result: mockResults[0] },
+        });
+        comms.mockRpcCall({
+          request: requests[1],
+          response: { result: mockResults[1] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+        );
+
+        expect(results).toStrictEqual([mockResults[0], mockResults[1]]);
+      });
+    });
+  }
+}
diff --git a/app/scripts/controllers/network/provider-api-tests/block-param.js b/app/scripts/controllers/network/provider-api-tests/block-param.js
new file mode 100644
index 000000000..49bd6e772
--- /dev/null
+++ b/app/scripts/controllers/network/provider-api-tests/block-param.js
@@ -0,0 +1,2059 @@
+/* eslint-disable jest/require-top-level-describe, jest/no-export */
+
+import {
+  buildMockParams,
+  buildRequestWithReplacedBlockParam,
+  waitForPromiseToBeFulfilledAfterRunningAllTimers,
+  withMockedCommunications,
+  withNetworkClient,
+} from './helpers';
+import {
+  buildFetchFailedErrorMessage,
+  buildInfuraClientRetriesExhaustedErrorMessage,
+  buildJsonRpcEngineEmptyResponseErrorMessage,
+} from './shared-tests';
+
+/**
+ * Defines tests which exercise the behavior exhibited by an RPC method that
+ * takes a block parameter. The value of this parameter can be either a block
+ * number or a block tag ("latest", "earliest", or "pending") and affects how
+ * the method is cached.
+ *
+ * @param method - The name of the RPC method under test.
+ * @param additionalArgs - Additional arguments.
+ * @param additionalArgs.blockParamIndex - The index of the block parameter.
+ * @param additionalArgs.numberOfParameters - The number of parameters supported by the method under test.
+ * @param additionalArgs.providerType - The type of provider being tested.
+ * either `infura` or `custom` (default: "infura").
+ */
+/* eslint-disable-next-line jest/no-export */
+export function testsForRpcMethodSupportingBlockParam(
+  method,
+  { blockParamIndex, numberOfParameters, providerType },
+) {
+  describe.each([
+    ['given no block tag', undefined],
+    ['given a block tag of "latest"', 'latest'],
+  ])('%s', (_desc, blockParam) => {
+    it('does not hit the RPC endpoint more than once for identical requests', async () => {
+      const requests = [
+        {
+          method,
+          params: buildMockParams({ blockParamIndex, blockParam }),
+        },
+        { method, params: buildMockParams({ blockParamIndex, blockParam }) },
+      ];
+      const mockResults = ['first result', 'second result'];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the block-cache
+        // middleware will request the latest block number through the block
+        // tracker to determine the cache key. Later, the block-ref
+        // middleware will request the latest block number again to resolve
+        // the value of "latest", but the block number is cached once made,
+        // so we only need to mock the request once.
+        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+        // The block-ref middleware will make the request as specified
+        // except that the block param is replaced with the latest block
+        // number.
+        comms.mockRpcCall({
+          request: buildRequestWithReplacedBlockParam(
+            requests[0],
+            blockParamIndex,
+            '0x100',
+          ),
+          response: { result: mockResults[0] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+        );
+
+        expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
+      });
+    });
+
+    for (const paramIndex of [...Array(numberOfParameters).keys()]) {
+      if (paramIndex === blockParamIndex) {
+        // testing changes in block param is covered under later tests
+        continue;
+      }
+
+      it(`does not reuse the result of a previous request if parameter at index "${paramIndex}" differs`, async () => {
+        const firstMockParams = [
+          ...new Array(numberOfParameters).fill('some value'),
+        ];
+        firstMockParams[blockParamIndex] = blockParam;
+        const secondMockParams = firstMockParams.slice();
+        secondMockParams[paramIndex] = 'another value';
+        const requests = [
+          {
+            method,
+            params: firstMockParams,
+          },
+          { method, params: secondMockParams },
+        ];
+        const mockResults = ['first result', 'second result'];
+
+        await withMockedCommunications({ providerType }, async (comms) => {
+          // The first time a block-cacheable request is made, the block-cache
+          // middleware will request the latest block number through the block
+          // tracker to determine the cache key. Later, the block-ref
+          // middleware will request the latest block number again to resolve
+          // the value of "latest", but the block number is cached once made,
+          // so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              requests[0],
+              blockParamIndex,
+              '0x100',
+            ),
+            response: { result: mockResults[0] },
+          });
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              requests[1],
+              blockParamIndex,
+              '0x100',
+            ),
+            response: { result: mockResults[1] },
+          });
+
+          const results = await withNetworkClient(
+            { providerType },
+            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+          );
+
+          expect(results).toStrictEqual([mockResults[0], mockResults[1]]);
+        });
+      });
+    }
+
+    it('hits the RPC endpoint and does not reuse the result of a previous request if the latest block number was updated since', async () => {
+      const requests = [
+        { method, params: buildMockParams({ blockParamIndex, blockParam }) },
+        { method, params: buildMockParams({ blockParamIndex, blockParam }) },
+      ];
+      const mockResults = ['first result', 'second result'];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // Note that we have to mock these requests in a specific order.
+        // The first block tracker request occurs because of the first RPC
+        // request. The second block tracker request, however, does not
+        // occur because of the second RPC request, but rather because we
+        // call `clock.runAll()` below.
+        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+        // The block-ref middleware will make the request as specified
+        // except that the block param is replaced with the latest block
+        // number.
+        comms.mockRpcCall({
+          request: buildRequestWithReplacedBlockParam(
+            requests[0],
+            blockParamIndex,
+            '0x100',
+          ),
+          response: { result: mockResults[0] },
+        });
+        comms.mockNextBlockTrackerRequest({ blockNumber: '0x200' });
+        comms.mockRpcCall({
+          request: buildRequestWithReplacedBlockParam(
+            requests[1],
+            blockParamIndex,
+            '0x200',
+          ),
+          response: { result: mockResults[1] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          async (client) => {
+            const firstResult = await client.makeRpcCall(requests[0]);
+            // Proceed to the next iteration of the block tracker so that a
+            // new block is fetched and the current block is updated.
+            client.clock.runAll();
+            const secondResult = await client.makeRpcCall(requests[1]);
+            return [firstResult, secondResult];
+          },
+        );
+
+        expect(results).toStrictEqual(mockResults);
+      });
+    });
+
+    for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
+      it(`does not retry an empty response of "${emptyValue}"`, async () => {
+        const request = {
+          method,
+          params: buildMockParams({ blockParamIndex, blockParam }),
+        };
+        const mockResult = emptyValue;
+
+        await withMockedCommunications({ providerType }, async (comms) => {
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: { result: mockResult },
+          });
+
+          const result = await withNetworkClient(
+            { providerType },
+            ({ makeRpcCall }) => makeRpcCall(request),
+          );
+
+          expect(result).toStrictEqual(mockResult);
+        });
+      });
+
+      it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
+        const requests = [
+          { method, params: buildMockParams({ blockParamIndex, blockParam }) },
+          { method, params: buildMockParams({ blockParamIndex, blockParam }) },
+        ];
+        const mockResults = [emptyValue, 'some result'];
+
+        await withMockedCommunications({ providerType }, async (comms) => {
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              requests[0],
+              blockParamIndex,
+              '0x100',
+            ),
+            response: { result: mockResults[0] },
+          });
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              requests[1],
+              blockParamIndex,
+              '0x100',
+            ),
+            response: { result: mockResults[1] },
+          });
+
+          const results = await withNetworkClient(
+            { providerType },
+            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+          );
+
+          expect(results).toStrictEqual(mockResults);
+        });
+      });
+    }
+
+    it('queues requests while a previous identical call is still pending, then runs the queue when it finishes, reusing the result from the first request', async () => {
+      const requests = [
+        { method, params: buildMockParams({ blockParamIndex, blockParam }) },
+        { method, params: buildMockParams({ blockParamIndex, blockParam }) },
+        { method, params: buildMockParams({ blockParamIndex, blockParam }) },
+      ];
+      const mockResults = ['first result', 'second result', 'third result'];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the
+        // block-cache middleware will request the latest block number
+        // through the block tracker to determine the cache key. Later,
+        // the block-ref middleware will request the latest block number
+        // again to resolve the value of "latest", but the block number is
+        // cached once made, so we only need to mock the request once.
+        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+        // The block-ref middleware will make the request as specified
+        // except that the block param is replaced with the latest block
+        // number, and we delay it.
+        comms.mockRpcCall({
+          delay: 100,
+          request: buildRequestWithReplacedBlockParam(
+            requests[0],
+            blockParamIndex,
+            '0x100',
+          ),
+          response: { result: mockResults[0] },
+        });
+        // The previous two requests will happen again, in the same order.
+        comms.mockRpcCall({
+          request: buildRequestWithReplacedBlockParam(
+            requests[1],
+            blockParamIndex,
+            '0x100',
+          ),
+          response: { result: mockResults[1] },
+        });
+        comms.mockRpcCall({
+          request: buildRequestWithReplacedBlockParam(
+            requests[2],
+            blockParamIndex,
+            '0x100',
+          ),
+          response: { result: mockResults[2] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          async (client) => {
+            const resultPromises = [
+              client.makeRpcCall(requests[0]),
+              client.makeRpcCall(requests[1]),
+              client.makeRpcCall(requests[2]),
+            ];
+            const firstResult = await resultPromises[0];
+            // The inflight cache middleware uses setTimeout to run the
+            // handlers, so run them now
+            client.clock.runAll();
+            const remainingResults = await Promise.all(resultPromises.slice(1));
+            return [firstResult, ...remainingResults];
+          },
+        );
+
+        expect(results).toStrictEqual([
+          mockResults[0],
+          mockResults[0],
+          mockResults[0],
+        ]);
+      });
+    });
+
+    it('throws an error with a custom message if the request to the RPC endpoint returns a 405 response', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the
+        // block-cache middleware will request the latest block number
+        // through the block tracker to determine the cache key. Later,
+        // the block-ref middleware will request the latest block number
+        // again to resolve the value of "latest", but the block number is
+        // cached once made, so we only need to mock the request once.
+        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+        // The block-ref middleware will make the request as specified
+        // except that the block param is replaced with the latest block
+        // number.
+        comms.mockRpcCall({
+          request: buildRequestWithReplacedBlockParam(
+            request,
+            blockParamIndex,
+            '0x100',
+          ),
+          response: {
+            httpStatus: 405,
+          },
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          'The method does not exist / is not available',
+        );
+      });
+    });
+
+    // There is a difference in how we are testing the Infura middleware vs. the
+    // custom RPC middleware (or, more specifically, the fetch middleware)
+    // because of what both middleware treat as rate limiting errors. In this
+    // case, the fetch middleware treats a 418 response from the RPC endpoint as
+    // such an error, whereas to the Infura middleware, it is a 429 response.
+    if (providerType === 'infura') {
+      it('throws a generic, undescriptive error if the request to the RPC endpoint returns a 418 response', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            id: 123,
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              httpStatus: 418,
+            },
+          });
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall }) => makeRpcCall(request),
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            '{"id":123,"jsonrpc":"2.0"}',
+          );
+        });
+      });
+
+      it('throws an error with a custom message if the request to the RPC endpoint returns a 429 response', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              httpStatus: 429,
+            },
+          });
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall }) => makeRpcCall(request),
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            'Request is being rate limited',
+          );
+        });
+      });
+    } else {
+      it('throws an error with a custom message if the request to the RPC endpoint returns a 418 response', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              httpStatus: 418,
+            },
+          });
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall }) => makeRpcCall(request),
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            'Request is being rate limited.',
+          );
+        });
+      });
+
+      it('throws an undescriptive error if the request to the RPC endpoint returns a 429 response', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              httpStatus: 429,
+            },
+          });
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall }) => makeRpcCall(request),
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            "Non-200 status code: '429'",
+          );
+        });
+      });
+    }
+
+    it('throws an undescriptive error message if the request to the RPC endpoint returns a response that is not 405, 418, 429, 503, or 504', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the
+        // block-cache middleware will request the latest block number
+        // through the block tracker to determine the cache key. Later,
+        // the block-ref middleware will request the latest block number
+        // again to resolve the value of "latest", but the block number is
+        // cached once made, so we only need to mock the request once.
+        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+        // The block-ref middleware will make the request as specified
+        // except that the block param is replaced with the latest block
+        // number.
+        comms.mockRpcCall({
+          request: buildRequestWithReplacedBlockParam(
+            request,
+            blockParamIndex,
+            '0x100',
+          ),
+          response: {
+            id: 12345,
+            jsonrpc: '2.0',
+            error: 'some error',
+            httpStatus: 420,
+          },
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        const msg =
+          providerType === 'infura'
+            ? '{"id":12345,"jsonrpc":"2.0","error":"some error"}'
+            : "Non-200 status code: '420'";
+        await expect(promiseForResult).rejects.toThrow(msg);
+      });
+    });
+
+    [503, 504].forEach((httpStatus) => {
+      it(`retries the request to the RPC endpoint up to 5 times if it returns a ${httpStatus} response, returning the successful result if there is one on the 5th try`, async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          //
+          // Here we have the request fail for the first 4 tries, then succeed
+          // on the 5th try.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              error: 'some error',
+              httpStatus,
+            },
+            times: 4,
+          });
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              result: 'the result',
+              httpStatus: 200,
+            },
+          });
+          const result = await withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          expect(result).toStrictEqual('the result');
+        });
+      });
+
+      // Both the Infura middleware and custom RPC middleware detect a 503 or
+      // 504 response and retry the request to the RPC endpoint automatically
+      // but differ in what sort of response is returned when the number of
+      // retries is exhausted.
+      if (providerType === 'infura') {
+        it(`causes a request to fail with a custom error if the request to the RPC endpoint returns a ${httpStatus} response 5 times in a row`, async () => {
+          await withMockedCommunications({ providerType }, async (comms) => {
+            const request = {
+              method,
+              params: buildMockParams({ blockParam, blockParamIndex }),
+            };
+
+            // The first time a block-cacheable request is made, the
+            // block-cache middleware will request the latest block number
+            // through the block tracker to determine the cache key. Later,
+            // the block-ref middleware will request the latest block number
+            // again to resolve the value of "latest", but the block number is
+            // cached once made, so we only need to mock the request once.
+            comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+            // The block-ref middleware will make the request as specified
+            // except that the block param is replaced with the latest block
+            // number.
+            comms.mockRpcCall({
+              request: buildRequestWithReplacedBlockParam(
+                request,
+                blockParamIndex,
+                '0x100',
+              ),
+              response: {
+                error: 'Some error',
+                httpStatus,
+              },
+              times: 5,
+            });
+            const promiseForResult = withNetworkClient(
+              { providerType },
+              async ({ makeRpcCall, clock }) => {
+                return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                  makeRpcCall(request),
+                  clock,
+                );
+              },
+            );
+            await expect(promiseForResult).rejects.toThrow(
+              buildInfuraClientRetriesExhaustedErrorMessage('Gateway timeout'),
+            );
+          });
+        });
+      } else {
+        it(`produces an empty response if the request to the RPC endpoint returns a ${httpStatus} response 5 times in a row`, async () => {
+          await withMockedCommunications({ providerType }, async (comms) => {
+            const request = {
+              method,
+              params: buildMockParams({ blockParam, blockParamIndex }),
+            };
+
+            // The first time a block-cacheable request is made, the
+            // block-cache middleware will request the latest block number
+            // through the block tracker to determine the cache key. Later,
+            // the block-ref middleware will request the latest block number
+            // again to resolve the value of "latest", but the block number is
+            // cached once made, so we only need to mock the request once.
+            comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+            // The block-ref middleware will make the request as specified
+            // except that the block param is replaced with the latest block
+            // number.
+            comms.mockRpcCall({
+              request: buildRequestWithReplacedBlockParam(
+                request,
+                blockParamIndex,
+                '0x100',
+              ),
+              response: {
+                error: 'Some error',
+                httpStatus,
+              },
+              times: 5,
+            });
+            const promiseForResult = withNetworkClient(
+              { providerType },
+              async ({ makeRpcCall, clock }) => {
+                return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                  makeRpcCall(request),
+                  clock,
+                );
+              },
+            );
+            await expect(promiseForResult).rejects.toThrow(
+              buildJsonRpcEngineEmptyResponseErrorMessage(method),
+            );
+          });
+        });
+      }
+    });
+
+    it('retries the request to the RPC endpoint up to 5 times if an "ETIMEDOUT" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = {
+          method,
+          params: buildMockParams({ blockParam, blockParamIndex }),
+        };
+
+        // The first time a block-cacheable request is made, the
+        // block-cache middleware will request the latest block number
+        // through the block tracker to determine the cache key. Later,
+        // the block-ref middleware will request the latest block number
+        // again to resolve the value of "latest", but the block number is
+        // cached once made, so we only need to mock the request once.
+        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+        // The block-ref middleware will make the request as specified
+        // except that the block param is replaced with the latest block
+        // number.
+        //
+        // Here we have the request fail for the first 4 tries, then
+        // succeed on the 5th try.
+        comms.mockRpcCall({
+          request: buildRequestWithReplacedBlockParam(
+            request,
+            blockParamIndex,
+            '0x100',
+          ),
+          error: 'ETIMEDOUT: Some message',
+          times: 4,
+        });
+        comms.mockRpcCall({
+          request: buildRequestWithReplacedBlockParam(
+            request,
+            blockParamIndex,
+            '0x100',
+          ),
+          response: {
+            result: 'the result',
+            httpStatus: 200,
+          },
+        });
+
+        const result = await withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        expect(result).toStrictEqual('the result');
+      });
+    });
+
+    // Both the Infura and fetch middleware detect ETIMEDOUT errors and will
+    // automatically retry the request to the RPC endpoint in question, but each
+    // produces a different error if the number of retries is exhausted.
+    if (providerType === 'infura') {
+      it('causes a request to fail with a custom error if an "ETIMEDOUT" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = { method };
+          const errorMessage = 'ETIMEDOUT: Some message';
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: errorMessage,
+            times: 5,
+          });
+
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
+          );
+        });
+      });
+    } else {
+      it('produces an empty response if an "ETIMEDOUT" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+          const errorMessage = 'ETIMEDOUT: Some message';
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: errorMessage,
+            times: 5,
+          });
+
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildJsonRpcEngineEmptyResponseErrorMessage(method),
+          );
+        });
+      });
+    }
+
+    // The Infura middleware treats a response that contains an ECONNRESET
+    // message as an innocuous error that is likely to disappear on a retry. The
+    // custom RPC middleware, on the other hand, does not specially handle this
+    // error.
+    if (providerType === 'infura') {
+      it('retries the request to the RPC endpoint up to 5 times if an "ECONNRESET" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          //
+          // Here we have the request fail for the first 4 tries, then
+          // succeed on the 5th try.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: 'ECONNRESET: Some message',
+            times: 4,
+          });
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              result: 'the result',
+              httpStatus: 200,
+            },
+          });
+
+          const result = await withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          expect(result).toStrictEqual('the result');
+        });
+      });
+
+      it('causes a request to fail with a custom error if an "ECONNRESET" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+          const errorMessage = 'ECONNRESET: Some message';
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: errorMessage,
+            times: 5,
+          });
+
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
+          );
+        });
+      });
+    } else {
+      it('does not retry the request to the RPC endpoint, but throws immediately, if an "ECONNRESET" error is thrown while making the request', async () => {
+        const customRpcUrl = 'http://example.com';
+
+        await withMockedCommunications(
+          { providerType, customRpcUrl },
+          async (comms) => {
+            const request = {
+              method,
+              params: buildMockParams({ blockParam, blockParamIndex }),
+            };
+            const errorMessage = 'ECONNRESET: Some message';
+
+            // The first time a block-cacheable request is made, the
+            // block-cache middleware will request the latest block number
+            // through the block tracker to determine the cache key. Later,
+            // the block-ref middleware will request the latest block number
+            // again to resolve the value of "latest", but the block number is
+            // cached once made, so we only need to mock the request once.
+            comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+            // The block-ref middleware will make the request as specified
+            // except that the block param is replaced with the latest block
+            // number.
+            comms.mockRpcCall({
+              request: buildRequestWithReplacedBlockParam(
+                request,
+                blockParamIndex,
+                '0x100',
+              ),
+              error: errorMessage,
+            });
+
+            const promiseForResult = withNetworkClient(
+              { providerType, customRpcUrl },
+              async ({ makeRpcCall }) => makeRpcCall(request),
+            );
+
+            await expect(promiseForResult).rejects.toThrow(
+              buildFetchFailedErrorMessage(customRpcUrl, errorMessage),
+            );
+          },
+        );
+      });
+    }
+
+    // Both the Infura and fetch middleware will attempt to parse the response
+    // body as JSON, and if this step produces an error, both middleware will
+    // also attempt to retry the request. However, this error handling code is
+    // slightly different between the two. As the error in this case is a
+    // SyntaxError, the Infura middleware will catch it immediately, whereas the
+    // custom RPC middleware will catch it and re-throw a separate error, which
+    // it then catches later.
+    if (providerType === 'infura') {
+      it('retries the request to the RPC endpoint up to 5 times if a "SyntaxError" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          //
+          // Here we have the request fail for the first 4 tries, then
+          // succeed on the 5th try.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: 'SyntaxError: Some message',
+            times: 4,
+          });
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              result: 'the result',
+              httpStatus: 200,
+            },
+          });
+          const result = await withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          expect(result).toStrictEqual('the result');
+        });
+      });
+
+      it('causes a request to fail with a custom error if a "SyntaxError" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+          const errorMessage = 'SyntaxError: Some message';
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: errorMessage,
+            times: 5,
+          });
+
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
+          );
+        });
+      });
+
+      it('does not retry the request to the RPC endpoint, but throws immediately, if a "failed to parse response body" error is thrown while making the request', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+          const errorMessage = 'failed to parse response body: Some message';
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: errorMessage,
+          });
+
+          const promiseForResult = withNetworkClient(
+            { providerType, infuraNetwork: comms.infuraNetwork },
+            async ({ makeRpcCall }) => makeRpcCall(request),
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildFetchFailedErrorMessage(comms.rpcUrl, errorMessage),
+          );
+        });
+      });
+    } else {
+      it('does not retry the request to the RPC endpoint, but throws immediately, if a "SyntaxError" error is thrown while making the request', async () => {
+        const customRpcUrl = 'http://example.com';
+
+        await withMockedCommunications(
+          { providerType, customRpcUrl },
+          async (comms) => {
+            const request = {
+              method,
+              params: buildMockParams({ blockParam, blockParamIndex }),
+            };
+            const errorMessage = 'SyntaxError: Some message';
+
+            // The first time a block-cacheable request is made, the
+            // block-cache middleware will request the latest block number
+            // through the block tracker to determine the cache key. Later,
+            // the block-ref middleware will request the latest block number
+            // again to resolve the value of "latest", but the block number is
+            // cached once made, so we only need to mock the request once.
+            comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+            // The block-ref middleware will make the request as specified
+            // except that the block param is replaced with the latest block
+            // number.
+            comms.mockRpcCall({
+              request: buildRequestWithReplacedBlockParam(
+                request,
+                blockParamIndex,
+                '0x100',
+              ),
+              error: errorMessage,
+            });
+
+            const promiseForResult = withNetworkClient(
+              { providerType, customRpcUrl },
+              async ({ makeRpcCall }) => makeRpcCall(request),
+            );
+
+            await expect(promiseForResult).rejects.toThrow(
+              buildFetchFailedErrorMessage(customRpcUrl, errorMessage),
+            );
+          },
+        );
+      });
+
+      it('retries the request to the RPC endpoint up to 5 times if a "failed to parse response body" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          //
+          // Here we have the request fail for the first 4 tries, then
+          // succeed on the 5th try.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: 'failed to parse response body: Some message',
+            times: 4,
+          });
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              result: 'the result',
+              httpStatus: 200,
+            },
+          });
+
+          const result = await withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          expect(result).toStrictEqual('the result');
+        });
+      });
+
+      it('produces an empty response if a "failed to parse response body" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+          const errorMessage = 'failed to parse response body: some message';
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: errorMessage,
+            times: 5,
+          });
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildJsonRpcEngineEmptyResponseErrorMessage(method),
+          );
+        });
+      });
+    }
+
+    // Only the custom RPC middleware will detect a "Failed to fetch" error and
+    // attempt to retry the request to the RPC endpoint; the Infura middleware
+    // does not.
+    if (providerType === 'infura') {
+      it('does not retry the request to the RPC endpoint, but throws immediately, if a "Failed to fetch" error is thrown while making the request', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+          const errorMessage = 'Failed to fetch: Some message';
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: errorMessage,
+          });
+
+          const promiseForResult = withNetworkClient(
+            { providerType, infuraNetwork: comms.infuraNetwork },
+            async ({ makeRpcCall }) => makeRpcCall(request),
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildFetchFailedErrorMessage(comms.rpcUrl, errorMessage),
+          );
+        });
+      });
+    } else {
+      it('retries the request to the RPC endpoint up to 5 times if a "Failed to fetch" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParam, blockParamIndex }),
+          };
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          //
+          // Here we have the request fail for the first 4 tries, then
+          // succeed on the 5th try.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: 'Failed to fetch: Some message',
+            times: 4,
+          });
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            response: {
+              result: 'the result',
+              httpStatus: 200,
+            },
+          });
+
+          const result = await withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          expect(result).toStrictEqual('the result');
+        });
+      });
+
+      it('produces an empty response if a "Failed to fetch" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const request = { method };
+          const errorMessage = 'Failed to fetch: some message';
+
+          // The first time a block-cacheable request is made, the
+          // block-cache middleware will request the latest block number
+          // through the block tracker to determine the cache key. Later,
+          // the block-ref middleware will request the latest block number
+          // again to resolve the value of "latest", but the block number is
+          // cached once made, so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: buildRequestWithReplacedBlockParam(
+              request,
+              blockParamIndex,
+              '0x100',
+            ),
+            error: errorMessage,
+            times: 5,
+          });
+          const promiseForResult = withNetworkClient(
+            { providerType },
+            async ({ makeRpcCall, clock }) => {
+              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                makeRpcCall(request),
+                clock,
+              );
+            },
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildJsonRpcEngineEmptyResponseErrorMessage(method),
+          );
+        });
+      });
+    }
+  });
+
+  describe.each([
+    ['given a block tag of "earliest"', 'earliest', 'earliest'],
+    ['given a block number', 'block number', '0x100'],
+  ])('%s', (_desc, blockParamType, blockParam) => {
+    it('does not hit the RPC endpoint more than once for identical requests', async () => {
+      const requests = [
+        {
+          method,
+          params: buildMockParams({ blockParamIndex, blockParam }),
+        },
+        {
+          method,
+          params: buildMockParams({ blockParamIndex, blockParam }),
+        },
+      ];
+      const mockResults = ['first result', 'second result'];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the block-cache
+        // middleware will request the latest block number through the block
+        // tracker to determine the cache key. This block number doesn't
+        // matter.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request: requests[0],
+          response: { result: mockResults[0] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+        );
+
+        expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
+      });
+    });
+
+    for (const paramIndex of [...Array(numberOfParameters).keys()]) {
+      if (paramIndex === blockParamIndex) {
+        // testing changes in block param is covered under later tests
+        continue;
+      }
+      it(`does not reuse the result of a previous request if parameter at index "${paramIndex}" differs`, async () => {
+        const firstMockParams = [
+          ...new Array(numberOfParameters).fill('some value'),
+        ];
+        firstMockParams[blockParamIndex] = blockParam;
+        const secondMockParams = firstMockParams.slice();
+        secondMockParams[paramIndex] = 'another value';
+        const requests = [
+          {
+            method,
+            params: firstMockParams,
+          },
+          { method, params: secondMockParams },
+        ];
+        const mockResults = ['first result', 'second result'];
+
+        await withMockedCommunications({ providerType }, async (comms) => {
+          // The first time a block-cacheable request is made, the block-cache
+          // middleware will request the latest block number through the block
+          // tracker to determine the cache key. Later, the block-ref
+          // middleware will request the latest block number again to resolve
+          // the value of "latest", but the block number is cached once made,
+          // so we only need to mock the request once.
+          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
+          // The block-ref middleware will make the request as specified
+          // except that the block param is replaced with the latest block
+          // number.
+          comms.mockRpcCall({
+            request: requests[0],
+            response: { result: mockResults[0] },
+          });
+          comms.mockRpcCall({
+            request: requests[1],
+            response: { result: mockResults[1] },
+          });
+
+          const results = await withNetworkClient(
+            { providerType },
+            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+          );
+
+          expect(results).toStrictEqual([mockResults[0], mockResults[1]]);
+        });
+      });
+    }
+
+    it('reuses the result of a previous request even if the latest block number was updated since', async () => {
+      const requests = [
+        {
+          method,
+          params: buildMockParams({ blockParamIndex, blockParam }),
+        },
+        {
+          method,
+          params: buildMockParams({ blockParamIndex, blockParam }),
+        },
+      ];
+      const mockResults = ['first result', 'second result'];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // Note that we have to mock these requests in a specific order. The
+        // first block tracker request occurs because of the first RPC
+        // request. The second block tracker request, however, does not
+        // occur because of the second RPC request, but rather because we
+        // call `clock.runAll()` below.
+        comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' });
+        comms.mockRpcCall({
+          request: requests[0],
+          response: { result: mockResults[0] },
+        });
+        comms.mockNextBlockTrackerRequest({ blockNumber: '0x2' });
+        comms.mockRpcCall({
+          request: requests[1],
+          response: { result: mockResults[1] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          async (client) => {
+            const firstResult = await client.makeRpcCall(requests[0]);
+            // Proceed to the next iteration of the block tracker so that a
+            // new block is fetched and the current block is updated.
+            client.clock.runAll();
+            const secondResult = await client.makeRpcCall(requests[1]);
+            return [firstResult, secondResult];
+          },
+        );
+
+        expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
+      });
+    });
+
+    if (blockParamType === 'earliest') {
+      it('treats "0x00" as a synonym for "earliest"', async () => {
+        const requests = [
+          {
+            method,
+            params: buildMockParams({ blockParamIndex, blockParam }),
+          },
+          {
+            method,
+            params: buildMockParams({ blockParamIndex, blockParam: '0x00' }),
+          },
+        ];
+        const mockResults = ['first result', 'second result'];
+
+        await withMockedCommunications({ providerType }, async (comms) => {
+          // The first time a block-cacheable request is made, the latest
+          // block number is retrieved through the block tracker first. It
+          // doesn't matter what this is — it's just used as a cache key.
+          comms.mockNextBlockTrackerRequest();
+          comms.mockRpcCall({
+            request: requests[0],
+            response: { result: mockResults[0] },
+          });
+
+          const results = await withNetworkClient(
+            { providerType },
+            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+          );
+
+          expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
+        });
+      });
+
+      for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
+        it(`does not retry an empty response of "${emptyValue}"`, async () => {
+          const request = {
+            method,
+            params: buildMockParams({ blockParamIndex, blockParam }),
+          };
+          const mockResult = emptyValue;
+
+          await withMockedCommunications({ providerType }, async (comms) => {
+            // The first time a block-cacheable request is made, the latest block
+            // number is retrieved through the block tracker first. It doesn't
+            // matter what this is — it's just used as a cache key.
+            comms.mockNextBlockTrackerRequest();
+            comms.mockRpcCall({
+              request,
+              response: { result: mockResult },
+            });
+
+            const result = await withNetworkClient(
+              { providerType },
+              ({ makeRpcCall }) => makeRpcCall(request),
+            );
+
+            expect(result).toStrictEqual(mockResult);
+          });
+        });
+
+        it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
+          const requests = [
+            {
+              method,
+              params: buildMockParams({ blockParamIndex, blockParam }),
+            },
+            {
+              method,
+              params: buildMockParams({ blockParamIndex, blockParam }),
+            },
+          ];
+          const mockResults = [emptyValue, 'some result'];
+
+          await withMockedCommunications({ providerType }, async (comms) => {
+            // The first time a block-cacheable request is made, the latest block
+            // number is retrieved through the block tracker first. It doesn't
+            // matter what this is — it's just used as a cache key.
+            comms.mockNextBlockTrackerRequest();
+            comms.mockRpcCall({
+              request: requests[0],
+              response: { result: mockResults[0] },
+            });
+            comms.mockRpcCall({
+              request: requests[1],
+              response: { result: mockResults[1] },
+            });
+
+            const results = await withNetworkClient(
+              { providerType },
+              ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+            );
+
+            expect(results).toStrictEqual(mockResults);
+          });
+        });
+      }
+    }
+
+    if (blockParamType === 'block number') {
+      it('does not reuse the result of a previous request if it was made with different arguments than this one', async () => {
+        await withMockedCommunications({ providerType }, async (comms) => {
+          const requests = [
+            {
+              method,
+              params: buildMockParams({ blockParamIndex, blockParam: '0x100' }),
+            },
+            {
+              method,
+              params: buildMockParams({ blockParamIndex, blockParam: '0x200' }),
+            },
+          ];
+
+          // The first time a block-cacheable request is made, the latest block
+          // number is retrieved through the block tracker first. It doesn't
+          // matter what this is — it's just used as a cache key.
+          comms.mockNextBlockTrackerRequest();
+          comms.mockRpcCall({
+            request: requests[0],
+            response: { result: 'first result' },
+          });
+          comms.mockRpcCall({
+            request: requests[1],
+            response: { result: 'second result' },
+          });
+
+          const results = await withNetworkClient(
+            { providerType },
+            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+          );
+
+          expect(results).toStrictEqual(['first result', 'second result']);
+        });
+      });
+
+      describe.each(
+        [
+          ['less than the current block number', '0x200'],
+          ['equal to the curent block number', '0x100'],
+        ],
+        '%s',
+        (_nestedDesc, currentBlockNumber) => {
+          it('makes an additional request to the RPC endpoint', async () => {
+            await withMockedCommunications({ providerType }, async (comms) => {
+              const request = {
+                method,
+                // Note that `blockParam` is `0x100` here
+                params: buildMockParams({ blockParamIndex, blockParam }),
+              };
+
+              // The first time a block-cacheable request is made, the latest
+              // block number is retrieved through the block tracker first.
+              comms.mockNextBlockTrackerRequest({
+                blockNumber: currentBlockNumber,
+              });
+              comms.mockRpcCall({
+                request,
+                response: { result: 'the result' },
+              });
+
+              const result = await withNetworkClient(
+                { providerType },
+                ({ makeRpcCall }) => makeRpcCall(request),
+              );
+
+              expect(result).toStrictEqual('the result');
+            });
+          });
+
+          for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
+            if (providerType === 'infura') {
+              it(`retries up to 10 times if a "${emptyValue}" response is returned, returning successful non-empty response if there is one on the 10th try`, async () => {
+                const request = {
+                  method,
+                  // Note that `blockParam` is `0x100` here
+                  params: buildMockParams({ blockParamIndex, blockParam }),
+                };
+
+                await withMockedCommunications(
+                  { providerType },
+                  async (comms) => {
+                    // The first time a block-cacheable request is made, the latest block
+                    // number is retrieved through the block tracker first.
+                    comms.mockNextBlockTrackerRequest({
+                      blockNumber: currentBlockNumber,
+                    });
+                    comms.mockRpcCall({
+                      request,
+                      response: { result: emptyValue },
+                      times: 9,
+                    });
+                    comms.mockRpcCall({
+                      request,
+                      response: { result: 'some value' },
+                    });
+
+                    const result = await withNetworkClient(
+                      { providerType },
+                      ({ makeRpcCall, clock }) =>
+                        waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                          makeRpcCall(request),
+                          clock,
+                        ),
+                    );
+
+                    expect(result).toStrictEqual('some value');
+                  },
+                );
+              });
+
+              it(`retries up to 10 times if a "${emptyValue}" response is returned, failing after the 10th try`, async () => {
+                const request = {
+                  method,
+                  // Note that `blockParam` is `0x100` here
+                  params: buildMockParams({ blockParamIndex, blockParam }),
+                };
+                const mockResult = emptyValue;
+
+                await withMockedCommunications(
+                  { providerType },
+                  async (comms) => {
+                    // The first time a block-cacheable request is made, the latest block
+                    // number is retrieved through the block tracker first.
+                    comms.mockNextBlockTrackerRequest({
+                      blockNumber: currentBlockNumber,
+                    });
+                    comms.mockRpcCall({
+                      request,
+                      response: { result: mockResult },
+                      times: 10,
+                    });
+
+                    const promiseForResult = withNetworkClient(
+                      { providerType },
+                      ({ makeRpcCall, clock }) =>
+                        waitForPromiseToBeFulfilledAfterRunningAllTimers(
+                          makeRpcCall(request),
+                          clock,
+                        ),
+                    );
+
+                    await expect(promiseForResult).rejects.toThrow(
+                      'RetryOnEmptyMiddleware - retries exhausted',
+                    );
+                  },
+                );
+              });
+            } else {
+              it(`does not retry an empty response of "${emptyValue}"`, async () => {
+                const request = {
+                  method,
+                  // Note that `blockParam` is `0x100` here
+                  params: buildMockParams({ blockParamIndex, blockParam }),
+                };
+                const mockResult = emptyValue;
+
+                await withMockedCommunications(
+                  { providerType },
+                  async (comms) => {
+                    // The first time a block-cacheable request is made, the latest block
+                    // number is retrieved through the block tracker first.
+                    comms.mockNextBlockTrackerRequest({
+                      blockNumber: currentBlockNumber,
+                    });
+                    comms.mockRpcCall({
+                      request: buildRequestWithReplacedBlockParam(
+                        request,
+                        blockParamIndex,
+                        '0x100',
+                      ),
+                      response: { result: mockResult },
+                    });
+
+                    const result = await withNetworkClient(
+                      { providerType },
+                      ({ makeRpcCall }) => makeRpcCall(request),
+                    );
+
+                    expect(result).toStrictEqual(mockResult);
+                  },
+                );
+              });
+
+              it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
+                const requests = [
+                  {
+                    method,
+                    // Note that `blockParam` is `0x100` here
+                    params: buildMockParams({ blockParamIndex, blockParam }),
+                  },
+                  {
+                    method,
+                    // Note that `blockParam` is `0x100` here
+                    params: buildMockParams({ blockParamIndex, blockParam }),
+                  },
+                ];
+                const mockResults = [emptyValue, { blockHash: '0x100' }];
+
+                await withMockedCommunications(
+                  { providerType },
+                  async (comms) => {
+                    // The first time a block-cacheable request is made, the latest block
+                    // number is retrieved through the block tracker first.
+                    comms.mockNextBlockTrackerRequest({
+                      blockNumber: currentBlockNumber,
+                    });
+                    comms.mockRpcCall({
+                      request: buildRequestWithReplacedBlockParam(
+                        requests[0],
+                        blockParamIndex,
+                        '0x100',
+                      ),
+                      response: { result: mockResults[0] },
+                    });
+                    comms.mockRpcCall({
+                      request: buildRequestWithReplacedBlockParam(
+                        requests[1],
+                        blockParamIndex,
+                        '0x100',
+                      ),
+                      response: { result: mockResults[1] },
+                    });
+
+                    const results = await withNetworkClient(
+                      { providerType },
+                      ({ makeRpcCallsInSeries }) =>
+                        makeRpcCallsInSeries(requests),
+                    );
+
+                    expect(results).toStrictEqual(mockResults);
+                  },
+                );
+              });
+            }
+          }
+        },
+      );
+
+      describe('greater than the current block number', () => {
+        it('makes an additional request to the RPC endpoint', async () => {
+          await withMockedCommunications({ providerType }, async (comms) => {
+            const request = {
+              method,
+              // Note that `blockParam` is `0x100` here
+              params: buildMockParams({ blockParamIndex, blockParam }),
+            };
+
+            // The first time a block-cacheable request is made, the latest
+            // block number is retrieved through the block tracker first.
+            comms.mockNextBlockTrackerRequest({ blockNumber: '0x42' });
+            comms.mockRpcCall({
+              request,
+              response: { result: 'the result' },
+            });
+
+            const result = await withNetworkClient(
+              { providerType },
+              ({ makeRpcCall }) => makeRpcCall(request),
+            );
+
+            expect(result).toStrictEqual('the result');
+          });
+        });
+
+        for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
+          it(`does not retry an empty response of "${emptyValue}"`, async () => {
+            const request = {
+              method,
+              // Note that `blockParam` is `0x100` here
+              params: buildMockParams({ blockParamIndex, blockParam }),
+            };
+            const mockResult = emptyValue;
+
+            await withMockedCommunications({ providerType }, async (comms) => {
+              // The first time a block-cacheable request is made, the latest block
+              // number is retrieved through the block tracker first.
+              comms.mockNextBlockTrackerRequest({ blockNumber: '0x42' });
+              comms.mockRpcCall({
+                request: buildRequestWithReplacedBlockParam(
+                  request,
+                  blockParamIndex,
+                  '0x100',
+                ),
+                response: { result: mockResult },
+              });
+
+              const result = await withNetworkClient(
+                { providerType },
+                ({ makeRpcCall }) => makeRpcCall(request),
+              );
+
+              expect(result).toStrictEqual(mockResult);
+            });
+          });
+
+          it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
+            const requests = [
+              {
+                method,
+                // Note that `blockParam` is `0x100` here
+                params: buildMockParams({ blockParamIndex, blockParam }),
+              },
+              {
+                method,
+                // Note that `blockParam` is `0x100` here
+                params: buildMockParams({ blockParamIndex, blockParam }),
+              },
+            ];
+            const mockResults = [emptyValue, { blockHash: '0x100' }];
+
+            await withMockedCommunications({ providerType }, async (comms) => {
+              // The first time a block-cacheable request is made, the latest block
+              // number is retrieved through the block tracker first.
+              comms.mockNextBlockTrackerRequest({ blockNumber: '0x42' });
+              comms.mockRpcCall({
+                request: buildRequestWithReplacedBlockParam(
+                  requests[0],
+                  blockParamIndex,
+                  '0x100',
+                ),
+                response: { result: mockResults[0] },
+              });
+              comms.mockRpcCall({
+                request: buildRequestWithReplacedBlockParam(
+                  requests[1],
+                  blockParamIndex,
+                  '0x100',
+                ),
+                response: { result: mockResults[1] },
+              });
+
+              const results = await withNetworkClient(
+                { providerType },
+                ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+              );
+
+              expect(results).toStrictEqual(mockResults);
+            });
+          });
+        }
+      });
+    }
+  });
+
+  describe('given a block tag of "pending"', () => {
+    const params = buildMockParams({ blockParamIndex, blockParam: 'pending' });
+
+    it('hits the RPC endpoint on all calls and does not cache anything', async () => {
+      const requests = [
+        { method, params },
+        { method, params },
+      ];
+      const mockResults = ['first result', 'second result'];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the latest
+        // block number is retrieved through the block tracker first. It
+        // doesn't matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request: requests[0],
+          response: { result: mockResults[0] },
+        });
+        comms.mockRpcCall({
+          request: requests[1],
+          response: { result: mockResults[1] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+        );
+
+        expect(results).toStrictEqual(mockResults);
+      });
+    });
+  });
+}
diff --git a/app/scripts/controllers/network/provider-api-tests/helpers.js b/app/scripts/controllers/network/provider-api-tests/helpers.js
index f8deb72f8..a5d92b91e 100644
--- a/app/scripts/controllers/network/provider-api-tests/helpers.js
+++ b/app/scripts/controllers/network/provider-api-tests/helpers.js
@@ -13,55 +13,6 @@ import createJsonRpcClient from '../createJsonRpcClient';
  * base URL.
  */
 
-/**
- * @typedef {{blockTracker: import('eth-block-tracker').PollingBlockTracker, clock: sinon.SinonFakeTimers, makeRpcCall: (request: Partial<JsonRpcRequest>) => Promise<any>, makeRpcCallsInSeries: (requests: Partial<JsonRpcRequest>[]) => Promise<any>}} Client
- *
- * Provides methods to interact with the suite of middleware that
- * `createInfuraClient` or `createJsonRpcClient` exposes.
- */
-
-/**
- * @typedef {{providerType: "infura" | "custom", infuraNetwork?: string, customRpcUrl?: string, customChainId?: string}} WithClientOptions
- *
- * The options bag that `withNetworkClient` takes.
- */
-
-/**
- * @typedef {(client: Client) => Promise<any>} WithClientCallback
- *
- * The callback that `withNetworkClient` takes.
- */
-
-/**
- * @typedef {{ nockScope: NockScope, blockNumber: string }} MockBlockTrackerRequestOptions
- *
- * The options to `mockNextBlockTrackerRequest` and `mockAllBlockTrackerRequests`.
- */
-
-/**
- * @typedef {{ nockScope: NockScope, request: object, response: object, delay?: number }} MockRpcCallOptions
- *
- * The options to `mockRpcCall`.
- */
-
-/**
- * @typedef {{mockNextBlockTrackerRequest: (options: Omit<MockBlockTrackerRequestOptions, 'nockScope'>) => void, mockAllBlockTrackerRequests: (options: Omit<MockBlockTrackerRequestOptions, 'nockScope'>) => void, mockRpcCall: (options: Omit<MockRpcCallOptions, 'nockScope'>) => NockScope, rpcUrl: string, infuraNetwork: string}} Communications
- *
- * Provides methods to mock different kinds of requests to the provider.
- */
-
-/**
- * @typedef {{providerType: 'infura' | 'custom', infuraNetwork?: string}} WithMockedCommunicationsOptions
- *
- * The options bag that `Communications` takes.
- */
-
-/**
- * @typedef {(comms: Communications) => Promise<any>} WithMockedCommunicationsCallback
- *
- * The callback that `mockingCommunications` takes.
- */
-
 /**
  * A dummy value for the `infuraProjectId` option that `createInfuraClient`
  * needs. (Infura should not be hit during tests, but just in case, this should
@@ -82,6 +33,12 @@ const MOCK_RPC_URL = 'http://foo.com';
  */
 const DEFAULT_LATEST_BLOCK_NUMBER = '0x42';
 
+/**
+ * A reference to the original `setTimeout` function so that we can use it even
+ * when using fake timers.
+ */
+const originalSetTimeout = setTimeout;
+
 /**
  * If you're having trouble writing a test and you're wondering why the test
  * keeps failing, you can set `process.env.DEBUG_PROVIDER_TESTS` to `1`. This
@@ -103,14 +60,17 @@ function debug(...args) {
  */
 function buildScopeForMockingRequests(rpcUrl) {
   return nock(rpcUrl).filteringRequestBody((body) => {
-    const copyOfBody = JSON.parse(body);
-    // Some IDs are random, so remove them entirely from the request to make it
-    // possible to mock these requests
-    delete copyOfBody.id;
-    return JSON.stringify(copyOfBody);
+    debug('Nock Received Request: ', body);
+    return body;
   });
 }
 
+/**
+ * @typedef {{ nockScope: NockScope, blockNumber: string }} MockBlockTrackerRequestOptions
+ *
+ * The options to `mockNextBlockTrackerRequest` and `mockAllBlockTrackerRequests`.
+ */
+
 /**
  * Mocks the next request for the latest block that the block tracker will make.
  *
@@ -151,6 +111,12 @@ async function mockAllBlockTrackerRequests({
   }).persist();
 }
 
+/**
+ * @typedef {{ nockScope: NockScope, request: object, response: object, delay?: number }} MockRpcCallOptions
+ *
+ * The options to `mockRpcCall`.
+ */
+
 /**
  * Mocks a JSON-RPC request sent to the provider with the given response.
  * Provider type is inferred from the base url set on the nockScope.
@@ -177,24 +143,38 @@ function mockRpcCall({ nockScope, request, response, error, delay, times }) {
   // eth-query always passes `params`, so even if we don't supply this property,
   // for consistency with makeRpcCall, assume that the `body` contains it
   const { method, params = [], ...rest } = request;
-  const httpStatus = response?.httpStatus ?? 200;
-  let completeResponse;
+  let httpStatus = 200;
+  let completeResponse = { id: 2, jsonrpc: '2.0' };
   if (response !== undefined) {
-    if (response.body === undefined) {
-      completeResponse = { id: 1, jsonrpc: '2.0' };
-      ['id', 'jsonrpc', 'result', 'error'].forEach((prop) => {
-        if (response[prop] !== undefined) {
-          completeResponse[prop] = response[prop];
-        }
-      });
-    } else {
+    if ('body' in response) {
       completeResponse = response.body;
+    } else {
+      if (response.error) {
+        completeResponse.error = response.error;
+      } else {
+        completeResponse.result = response.result;
+      }
+      if (response.httpStatus) {
+        httpStatus = response.httpStatus;
+      }
     }
   }
   const url = nockScope.basePath.includes('infura.io')
     ? `/v3/${MOCK_INFURA_PROJECT_ID}`
     : '/';
+
+  debug('Mocking request:', {
+    url,
+    method,
+    params,
+    response,
+    error,
+    ...rest,
+    times,
+  });
+
   let nockRequest = nockScope.post(url, {
+    id: /\d*/u,
     jsonrpc: '2.0',
     method,
     params,
@@ -212,7 +192,17 @@ function mockRpcCall({ nockScope, request, response, error, delay, times }) {
   if (error !== undefined) {
     return nockRequest.replyWithError(error);
   } else if (completeResponse !== undefined) {
-    return nockRequest.reply(httpStatus, completeResponse);
+    return nockRequest.reply(httpStatus, (_, requestBody) => {
+      if (response !== undefined && !('body' in response)) {
+        if (response.id === undefined) {
+          completeResponse.id = requestBody.id;
+        } else {
+          completeResponse.id = response.id;
+        }
+      }
+      debug('Nock returning Response', completeResponse);
+      return completeResponse;
+    });
   }
   return nockRequest;
 }
@@ -240,6 +230,24 @@ function makeRpcCall(ethQuery, request) {
   });
 }
 
+/**
+ * @typedef {{providerType: 'infura' | 'custom', infuraNetwork?: string}} WithMockedCommunicationsOptions
+ *
+ * The options bag that `Communications` takes.
+ */
+
+/**
+ * @typedef {{mockNextBlockTrackerRequest: (options: Omit<MockBlockTrackerRequestOptions, 'nockScope'>) => void, mockAllBlockTrackerRequests: (options: Omit<MockBlockTrackerRequestOptions, 'nockScope'>) => void, mockRpcCall: (options: Omit<MockRpcCallOptions, 'nockScope'>) => NockScope, rpcUrl: string, infuraNetwork: string}} Communications
+ *
+ * Provides methods to mock different kinds of requests to the provider.
+ */
+
+/**
+ * @typedef {(comms: Communications) => Promise<any>} WithMockedCommunicationsCallback
+ *
+ * The callback that `mockingCommunications` takes.
+ */
+
 /**
  * Sets up request mocks for requests to the provider.
  *
@@ -275,6 +283,7 @@ export async function withMockedCommunications(
     mockAllBlockTrackerRequests({ nockScope, ...localOptions });
   const curriedMockRpcCall = (localOptions) =>
     mockRpcCall({ nockScope, ...localOptions });
+
   const comms = {
     mockNextBlockTrackerRequest: curriedMockNextBlockTrackerRequest,
     mockAllBlockTrackerRequests: curriedMockAllBlockTrackerRequests,
@@ -291,6 +300,71 @@ export async function withMockedCommunications(
   }
 }
 
+/**
+ * @typedef {{blockTracker: import('eth-block-tracker').PollingBlockTracker, clock: sinon.SinonFakeTimers, makeRpcCall: (request: Partial<JsonRpcRequest>) => Promise<any>, makeRpcCallsInSeries: (requests: Partial<JsonRpcRequest>[]) => Promise<any>}} MockNetworkClient
+ *
+ * Provides methods to interact with the suite of middleware that
+ * `createInfuraClient` or `createJsonRpcClient` exposes.
+ */
+
+/**
+ * Some middleware contain logic which retries the request if some condition
+ * applies. This retrying always happens out of band via `setTimeout`, and
+ * because we are stubbing time via Jest's fake timers, we have to manually
+ * advance the clock so that the `setTimeout` handlers get fired. We don't know
+ * when these timers will get created, however, so we have to keep advancing
+ * timers until the request has been made an appropriate number of times.
+ * Unfortunately we don't have a good way to know how many times a request has
+ * been retried, but the good news is that the middleware won't end, and thus
+ * the promise which the RPC call returns won't get fulfilled, until all retries
+ * have been made.
+ *
+ * @param promise - The promise which is returned by the RPC call.
+ * @param clock - A Sinon clock object which can be used to advance to the next
+ * `setTimeout` handler.
+ */
+export async function waitForPromiseToBeFulfilledAfterRunningAllTimers(
+  promise,
+  clock,
+) {
+  let hasPromiseBeenFulfilled = false;
+  let numTimesClockHasBeenAdvanced = 0;
+
+  promise
+    .catch((error) => {
+      // This is used to silence Node.js warnings about the rejection
+      // being handled asynchronously. The error is handled later when
+      // `promise` is awaited, but we log it here anyway in case it gets
+      // swallowed.
+      debug(error);
+    })
+    .finally(() => {
+      hasPromiseBeenFulfilled = true;
+    });
+
+  // `hasPromiseBeenFulfilled` is modified asynchronously.
+  /* eslint-disable-next-line no-unmodified-loop-condition */
+  while (!hasPromiseBeenFulfilled && numTimesClockHasBeenAdvanced < 15) {
+    clock.runAll();
+    await new Promise((resolve) => originalSetTimeout(resolve, 10));
+    numTimesClockHasBeenAdvanced += 1;
+  }
+
+  return promise;
+}
+
+/**
+ * @typedef {{providerType: "infura" | "custom", infuraNetwork?: string, customRpcUrl?: string, customChainId?: string}} WithClientOptions
+ *
+ * The options bag that `withNetworkClient` takes.
+ */
+
+/**
+ * @typedef {(client: MockNetworkClient) => Promise<any>} WithClientCallback
+ *
+ * The callback that `withNetworkClient` takes.
+ */
+
 /**
  * Builds a provider from the middleware (for the provider type) along with a
  * block tracker, runs the given function with those two things, and then
@@ -325,6 +399,13 @@ export async function withNetworkClient(
     );
   }
 
+  // Faking timers ends up doing two things:
+  // 1. Halting the block tracker (which depends on `setTimeout` to periodically
+  // request the latest block) set up in `eth-json-rpc-middleware`
+  // 2. Halting the retry logic in `@metamask/eth-json-rpc-infura` (which also
+  // depends on `setTimeout`)
+  const clock = sinon.useFakeTimers();
+
   // The JSON-RPC client wraps `eth_estimateGas` so that it takes 2 seconds longer
   // than it usually would to complete. Or at least it should — this doesn't
   // appear to be working correctly. Unset `IN_TEST` on `process.env` to prevent
@@ -355,12 +436,7 @@ export async function withNetworkClient(
     }
     return responses;
   };
-  // Faking timers ends up doing two things:
-  // 1. Halting the block tracker (which depends on `setTimeout` to periodically
-  // request the latest block) set up in `eth-json-rpc-middleware`
-  // 2. Halting the retry logic in `@metamask/eth-json-rpc-infura` (which also
-  // depends on `setTimeout`)
-  const clock = sinon.useFakeTimers();
+
   const client = {
     blockTracker,
     clock,
diff --git a/app/scripts/controllers/network/provider-api-tests/no-block-param.js b/app/scripts/controllers/network/provider-api-tests/no-block-param.js
new file mode 100644
index 000000000..08ae7edd0
--- /dev/null
+++ b/app/scripts/controllers/network/provider-api-tests/no-block-param.js
@@ -0,0 +1,968 @@
+/* eslint-disable jest/require-top-level-describe, jest/no-export */
+
+import {
+  waitForPromiseToBeFulfilledAfterRunningAllTimers,
+  withMockedCommunications,
+  withNetworkClient,
+} from './helpers';
+import {
+  buildFetchFailedErrorMessage,
+  buildInfuraClientRetriesExhaustedErrorMessage,
+  buildJsonRpcEngineEmptyResponseErrorMessage,
+} from './shared-tests';
+
+/**
+ * Defines tests which exercise the behavior exhibited by an RPC method which is
+ * assumed to not take a block parameter. Even if it does, the value of this
+ * parameter will not be used in determining how to cache the method.
+ *
+ * @param method - The name of the RPC method under test.
+ * @param additionalArgs - Additional arguments.
+ * @param additionalArgs.numberOfParameters - The number of parameters supported by the method under test.
+ * @param additionalArgs.providerType - The type of provider being tested;
+ * either `infura` or `custom` (default: "infura").
+ */
+export function testsForRpcMethodAssumingNoBlockParam(
+  method,
+  { numberOfParameters, providerType },
+) {
+  if (providerType !== 'infura' && providerType !== 'custom') {
+    throw new Error(
+      `providerType must be either "infura" or "custom", was "${providerType}" instead`,
+    );
+  }
+
+  it('does not hit the RPC endpoint more than once for identical requests', async () => {
+    const requests = [{ method }, { method }];
+    const mockResults = ['first result', 'second result'];
+
+    await withMockedCommunications({ providerType }, async (comms) => {
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      comms.mockRpcCall({
+        request: requests[0],
+        response: { result: mockResults[0] },
+      });
+
+      const results = await withNetworkClient(
+        { providerType },
+        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+      );
+
+      expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
+    });
+  });
+
+  for (const paramIndex of [...Array(numberOfParameters).keys()]) {
+    it(`does not reuse the result of a previous request if parameter at index "${paramIndex}" differs`, async () => {
+      const firstMockParams = [
+        ...new Array(numberOfParameters).fill('some value'),
+      ];
+      const secondMockParams = firstMockParams.slice();
+      secondMockParams[paramIndex] = 'another value';
+      const requests = [
+        {
+          method,
+          params: firstMockParams,
+        },
+        { method, params: secondMockParams },
+      ];
+      const mockResults = ['some result', 'another result'];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request: requests[0],
+          response: { result: mockResults[0] },
+        });
+        comms.mockRpcCall({
+          request: requests[1],
+          response: { result: mockResults[1] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+        );
+
+        expect(results).toStrictEqual([mockResults[0], mockResults[1]]);
+      });
+    });
+  }
+
+  it('hits the RPC endpoint and does not reuse the result of a previous request if the latest block number was updated since', async () => {
+    const requests = [{ method }, { method }];
+    const mockResults = ['first result', 'second result'];
+
+    await withMockedCommunications({ providerType }, async (comms) => {
+      // Note that we have to mock these requests in a specific order. The
+      // first block tracker request occurs because of the first RPC request.
+      // The second block tracker request, however, does not occur because of
+      // the second RPC request, but rather because we call `clock.runAll()`
+      // below.
+      comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' });
+      comms.mockRpcCall({
+        request: requests[0],
+        response: { result: mockResults[0] },
+      });
+      comms.mockNextBlockTrackerRequest({ blockNumber: '0x2' });
+      comms.mockRpcCall({
+        request: requests[1],
+        response: { result: mockResults[1] },
+      });
+
+      const results = await withNetworkClient(
+        { providerType },
+        async (client) => {
+          const firstResult = await client.makeRpcCall(requests[0]);
+          // Proceed to the next iteration of the block tracker so that a new
+          // block is fetched and the current block is updated.
+          client.clock.runAll();
+          const secondResult = await client.makeRpcCall(requests[1]);
+          return [firstResult, secondResult];
+        },
+      );
+
+      expect(results).toStrictEqual(mockResults);
+    });
+  });
+
+  for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
+    it(`does not retry an empty response of "${emptyValue}"`, async () => {
+      const request = { method };
+      const mockResult = emptyValue;
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          response: { result: mockResult },
+        });
+
+        const result = await withNetworkClient(
+          { providerType },
+          ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        expect(result).toStrictEqual(mockResult);
+      });
+    });
+
+    it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
+      const requests = [{ method }, { method }];
+      const mockResults = [emptyValue, 'some result'];
+
+      await withMockedCommunications({ providerType }, async (comms) => {
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request: requests[0],
+          response: { result: mockResults[0] },
+        });
+        comms.mockRpcCall({
+          request: requests[1],
+          response: { result: mockResults[1] },
+        });
+
+        const results = await withNetworkClient(
+          { providerType },
+          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
+        );
+
+        expect(results).toStrictEqual(mockResults);
+      });
+    });
+  }
+
+  it('queues requests while a previous identical call is still pending, then runs the queue when it finishes, reusing the result from the first request', async () => {
+    const requests = [{ method }, { method }, { method }];
+    const mockResults = ['first result', 'second result', 'third result'];
+
+    await withMockedCommunications({ providerType }, async (comms) => {
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      comms.mockRpcCall({
+        request: requests[0],
+        response: { result: mockResults[0] },
+        delay: 100,
+      });
+
+      comms.mockRpcCall({
+        request: requests[1],
+        response: { result: mockResults[1] },
+      });
+
+      comms.mockRpcCall({
+        request: requests[2],
+        response: { result: mockResults[2] },
+      });
+
+      const results = await withNetworkClient(
+        { providerType },
+        async (client) => {
+          const resultPromises = [
+            client.makeRpcCall(requests[0]),
+            client.makeRpcCall(requests[1]),
+            client.makeRpcCall(requests[2]),
+          ];
+          const firstResult = await resultPromises[0];
+          // The inflight cache middleware uses setTimeout to run the handlers,
+          // so run them now
+          client.clock.runAll();
+          const remainingResults = await Promise.all(resultPromises.slice(1));
+          return [firstResult, ...remainingResults];
+        },
+      );
+
+      expect(results).toStrictEqual([
+        mockResults[0],
+        mockResults[0],
+        mockResults[0],
+      ]);
+    });
+  });
+
+  it('throws a custom error if the request to the RPC endpoint returns a 405 response', async () => {
+    await withMockedCommunications({ providerType }, async (comms) => {
+      const request = { method };
+
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      comms.mockRpcCall({
+        request,
+        response: {
+          httpStatus: 405,
+        },
+      });
+      const promiseForResult = withNetworkClient(
+        { providerType },
+        async ({ makeRpcCall }) => makeRpcCall(request),
+      );
+
+      await expect(promiseForResult).rejects.toThrow(
+        'The method does not exist / is not available',
+      );
+    });
+  });
+
+  // There is a difference in how we are testing the Infura middleware vs. the
+  // custom RPC middleware (or, more specifically, the fetch middleware) because
+  // of what both middleware treat as rate limiting errors. In this case, the
+  // fetch middleware treats a 418 response from the RPC endpoint as such an
+  // error, whereas to the Infura middleware, it is a 429 response.
+  if (providerType === 'infura') {
+    it('throws an undescriptive error if the request to the RPC endpoint returns a 418 response', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { id: 123, method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          response: {
+            httpStatus: 418,
+          },
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          '{"id":123,"jsonrpc":"2.0"}',
+        );
+      });
+    });
+
+    it('throws an error with a custom message if the request to the RPC endpoint returns a 429 response', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          response: {
+            httpStatus: 429,
+          },
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          'Request is being rate limited',
+        );
+      });
+    });
+  } else {
+    it('throws a custom error if the request to the RPC endpoint returns a 418 response', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          response: {
+            httpStatus: 418,
+          },
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          'Request is being rate limited.',
+        );
+      });
+    });
+
+    it('throws an undescriptive error if the request to the RPC endpoint returns a 429 response', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          response: {
+            httpStatus: 429,
+          },
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          "Non-200 status code: '429'",
+        );
+      });
+    });
+  }
+
+  it('throws a generic, undescriptive error if the request to the RPC endpoint returns a response that is not 405, 418, 429, 503, or 504', async () => {
+    await withMockedCommunications({ providerType }, async (comms) => {
+      const request = { method };
+
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      comms.mockRpcCall({
+        request,
+        response: {
+          id: 12345,
+          jsonrpc: '2.0',
+          error: 'some error',
+          httpStatus: 420,
+        },
+      });
+      const promiseForResult = withNetworkClient(
+        { providerType },
+        async ({ makeRpcCall }) => makeRpcCall(request),
+      );
+
+      const errorMessage =
+        providerType === 'infura'
+          ? '{"id":12345,"jsonrpc":"2.0","error":"some error"}'
+          : "Non-200 status code: '420'";
+      await expect(promiseForResult).rejects.toThrow(errorMessage);
+    });
+  });
+
+  [503, 504].forEach((httpStatus) => {
+    it(`retries the request to the RPC endpoint up to 5 times if it returns a ${httpStatus} response, returning the successful result if there is one on the 5th try`, async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        // Here we have the request fail for the first 4 tries, then succeed
+        // on the 5th try.
+        comms.mockRpcCall({
+          request,
+          response: {
+            error: 'Some error',
+            httpStatus,
+          },
+          times: 4,
+        });
+        comms.mockRpcCall({
+          request,
+          response: {
+            result: 'the result',
+            httpStatus: 200,
+          },
+        });
+        const result = await withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        expect(result).toStrictEqual('the result');
+      });
+    });
+
+    it(`causes a request to fail with a custom error if the request to the RPC endpoint returns a ${httpStatus} response 5 times in a row`, async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          response: {
+            error: 'Some error',
+            httpStatus,
+          },
+          times: 5,
+        });
+        comms.mockNextBlockTrackerRequest();
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+        const err =
+          providerType === 'infura'
+            ? buildInfuraClientRetriesExhaustedErrorMessage('Gateway timeout')
+            : buildJsonRpcEngineEmptyResponseErrorMessage(method);
+        await expect(promiseForResult).rejects.toThrow(err);
+      });
+    });
+  });
+
+  it('retries the request to the RPC endpoint up to 5 times if an "ETIMEDOUT" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+    await withMockedCommunications({ providerType }, async (comms) => {
+      const request = { method };
+
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      // Here we have the request fail for the first 4 tries, then succeed
+      // on the 5th try.
+      comms.mockRpcCall({
+        request,
+        error: 'ETIMEDOUT: Some message',
+        times: 4,
+      });
+      comms.mockRpcCall({
+        request,
+        response: {
+          result: 'the result',
+          httpStatus: 200,
+        },
+      });
+
+      const result = await withNetworkClient(
+        { providerType },
+        async ({ makeRpcCall, clock }) => {
+          return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+            makeRpcCall(request),
+            clock,
+          );
+        },
+      );
+
+      expect(result).toStrictEqual('the result');
+    });
+  });
+
+  // Both the Infura and fetch middleware detect ETIMEDOUT errors and will
+  // automatically retry the request to the RPC endpoint in question, but both
+  // produce a different error if the number of retries is exhausted.
+  if (providerType === 'infura') {
+    it('causes a request to fail with a custom error if an "ETIMEDOUT" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+        const errorMessage = 'ETIMEDOUT: Some message';
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          error: errorMessage,
+          times: 5,
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
+        );
+      });
+    });
+  } else {
+    it('returns an empty response if an "ETIMEDOUT" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+        const errorMessage = 'ETIMEDOUT: Some message';
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          error: errorMessage,
+          times: 5,
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          buildJsonRpcEngineEmptyResponseErrorMessage(method),
+        );
+      });
+    });
+  }
+
+  // The Infura middleware treats a response that contains an ECONNRESET message
+  // as an innocuous error that is likely to disappear on a retry. The custom
+  // RPC middleware, on the other hand, does not specially handle this error.
+  if (providerType === 'infura') {
+    it('retries the request to the RPC endpoint up to 5 times if an "ECONNRESET" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        // Here we have the request fail for the first 4 tries, then succeed
+        // on the 5th try.
+        comms.mockRpcCall({
+          request,
+          error: 'ECONNRESET: Some message',
+          times: 4,
+        });
+        comms.mockRpcCall({
+          request,
+          response: {
+            result: 'the result',
+            httpStatus: 200,
+          },
+        });
+
+        const result = await withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        expect(result).toStrictEqual('the result');
+      });
+    });
+
+    it('causes a request to fail with a custom error if an "ECONNRESET" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+        const errorMessage = 'ECONNRESET: Some message';
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          error: errorMessage,
+          times: 5,
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
+        );
+      });
+    });
+  } else {
+    it('does not retry the request to the RPC endpoint, but throws immediately, if an "ECONNRESET" error is thrown while making the request', async () => {
+      const customRpcUrl = 'http://example.com';
+
+      await withMockedCommunications(
+        { providerType, customRpcUrl },
+        async (comms) => {
+          const request = { method };
+          const errorMessage = 'ECONNRESET: Some message';
+
+          // The first time a block-cacheable request is made, the latest block
+          // number is retrieved through the block tracker first. It doesn't
+          // matter what this is — it's just used as a cache key.
+          comms.mockNextBlockTrackerRequest();
+          comms.mockRpcCall({
+            request,
+            error: errorMessage,
+          });
+          const promiseForResult = withNetworkClient(
+            { providerType, customRpcUrl },
+            async ({ makeRpcCall }) => makeRpcCall(request),
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildFetchFailedErrorMessage(customRpcUrl, errorMessage),
+          );
+        },
+      );
+    });
+  }
+
+  // Both the Infura and fetch middleware will attempt to parse the response
+  // body as JSON, and if this step produces an error, both middleware will also
+  // attempt to retry the request. However, this error handling code is slightly
+  // different between the two. As the error in this case is a SyntaxError, the
+  // Infura middleware will catch it immediately, whereas the custom RPC
+  // middleware will catch it and re-throw a separate error, which it then
+  // catches later.
+  if (providerType === 'infura') {
+    it('retries the request to the RPC endpoint up to 5 times if an "SyntaxError" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        // Here we have the request fail for the first 4 tries, then succeed
+        // on the 5th try.
+        comms.mockRpcCall({
+          request,
+          error: 'SyntaxError: Some message',
+          times: 4,
+        });
+        comms.mockRpcCall({
+          request,
+          response: {
+            result: 'the result',
+            httpStatus: 200,
+          },
+        });
+
+        const result = await withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        expect(result).toStrictEqual('the result');
+      });
+    });
+
+    it('causes a request to fail with a custom error if an "SyntaxError" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+        const errorMessage = 'SyntaxError: Some message';
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          error: errorMessage,
+          times: 5,
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
+        );
+      });
+    });
+
+    it('does not retry the request to the RPC endpoint, but throws immediately, if a "failed to parse response body" error is thrown while making the request', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+        const errorMessage = 'failed to parse response body: some message';
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          error: errorMessage,
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType, infuraNetwork: comms.infuraNetwork },
+          async ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          buildFetchFailedErrorMessage(comms.rpcUrl, errorMessage),
+        );
+      });
+    });
+  } else {
+    it('does not retry the request to the RPC endpoint, but throws immediately, if a "SyntaxError" error is thrown while making the request', async () => {
+      const customRpcUrl = 'http://example.com';
+
+      await withMockedCommunications(
+        { providerType, customRpcUrl },
+        async (comms) => {
+          const request = { method };
+          const errorMessage = 'SyntaxError: Some message';
+
+          // The first time a block-cacheable request is made, the latest block
+          // number is retrieved through the block tracker first. It doesn't
+          // matter what this is — it's just used as a cache key.
+          comms.mockNextBlockTrackerRequest();
+          comms.mockRpcCall({
+            request,
+            error: errorMessage,
+          });
+          const promiseForResult = withNetworkClient(
+            { providerType, customRpcUrl },
+            async ({ makeRpcCall }) => makeRpcCall(request),
+          );
+
+          await expect(promiseForResult).rejects.toThrow(
+            buildFetchFailedErrorMessage(customRpcUrl, errorMessage),
+          );
+        },
+      );
+    });
+
+    it('retries the request to the RPC endpoint up to 5 times if a "failed to parse response body" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        // Here we have the request fail for the first 4 tries, then succeed
+        // on the 5th try.
+        comms.mockRpcCall({
+          request,
+          error: 'failed to parse response body: some message',
+          times: 4,
+        });
+        comms.mockRpcCall({
+          request,
+          response: {
+            result: 'the result',
+            httpStatus: 200,
+          },
+        });
+
+        const result = await withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        expect(result).toStrictEqual('the result');
+      });
+    });
+
+    it('returns an empty response if a "failed to parse response body" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+        const errorMessage = 'failed to parse response body: some message';
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          error: errorMessage,
+          times: 5,
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          buildJsonRpcEngineEmptyResponseErrorMessage(method),
+        );
+      });
+    });
+  }
+
+  // Only the custom RPC middleware will detect a "Failed to fetch" error and
+  // attempt to retry the request to the RPC endpoint; the Infura middleware
+  // does not.
+  if (providerType === 'infura') {
+    it('does not retry the request to the RPC endpoint, but throws immediately, if a "Failed to fetch" error is thrown while making the request', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+        const errorMessage = 'Failed to fetch: some message';
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          error: errorMessage,
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType, infuraNetwork: comms.infuraNetwork },
+          async ({ makeRpcCall }) => makeRpcCall(request),
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          buildFetchFailedErrorMessage(comms.rpcUrl, errorMessage),
+        );
+      });
+    });
+  } else {
+    it('retries the request to the RPC endpoint up to 5 times if a "Failed to fetch" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        // Here we have the request fail for the first 4 tries, then succeed
+        // on the 5th try.
+        comms.mockRpcCall({
+          request,
+          error: 'Failed to fetch: some message',
+          times: 4,
+        });
+        comms.mockRpcCall({
+          request,
+          response: {
+            result: 'the result',
+            httpStatus: 200,
+          },
+        });
+
+        const result = await withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        expect(result).toStrictEqual('the result');
+      });
+    });
+
+    it('returns an empty response if a "Failed to fetch" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
+      await withMockedCommunications({ providerType }, async (comms) => {
+        const request = { method };
+        const errorMessage = 'Failed to fetch: some message';
+
+        // The first time a block-cacheable request is made, the latest block
+        // number is retrieved through the block tracker first. It doesn't
+        // matter what this is — it's just used as a cache key.
+        comms.mockNextBlockTrackerRequest();
+        comms.mockRpcCall({
+          request,
+          error: errorMessage,
+          times: 5,
+        });
+        const promiseForResult = withNetworkClient(
+          { providerType },
+          async ({ makeRpcCall, clock }) => {
+            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
+              makeRpcCall(request),
+              clock,
+            );
+          },
+        );
+
+        await expect(promiseForResult).rejects.toThrow(
+          buildJsonRpcEngineEmptyResponseErrorMessage(method),
+        );
+      });
+    });
+  }
+}
diff --git a/app/scripts/controllers/network/provider-api-tests/not-handled-by-middleware.js b/app/scripts/controllers/network/provider-api-tests/not-handled-by-middleware.js
new file mode 100644
index 000000000..693d9f779
--- /dev/null
+++ b/app/scripts/controllers/network/provider-api-tests/not-handled-by-middleware.js
@@ -0,0 +1,51 @@
+/* eslint-disable jest/require-top-level-describe, jest/no-export */
+
+import { fill } from 'lodash';
+import { withMockedCommunications, withNetworkClient } from './helpers';
+
+/**
+ * Defines tests which exercise the behavior exhibited by an RPC method that
+ * is not handled specially by the network client middleware.
+ *
+ * @param method - The name of the RPC method under test.
+ * @param additionalArgs - Additional arguments.
+ * @param additionalArgs.providerType - The type of provider being tested;
+ * either `infura` or `custom`.
+ * @param additionalArgs.numberOfParameters - The number of parameters that this
+ * RPC method takes.
+ */
+export function testsForRpcMethodNotHandledByMiddleware(
+  method,
+  { providerType, numberOfParameters },
+) {
+  if (providerType !== 'infura' && providerType !== 'custom') {
+    throw new Error(
+      `providerType must be either "infura" or "custom", was "${providerType}" instead`,
+    );
+  }
+
+  it('attempts to pass the request off to the RPC endpoint', async () => {
+    const request = {
+      method,
+      params: fill(Array(numberOfParameters), 'some value'),
+    };
+    const expectedResult = 'the result';
+
+    await withMockedCommunications({ providerType }, async (comms) => {
+      // The first time a block-cacheable request is made, the latest block
+      // number is retrieved through the block tracker first. It doesn't
+      // matter what this is — it's just used as a cache key.
+      comms.mockNextBlockTrackerRequest();
+      comms.mockRpcCall({
+        request,
+        response: { result: expectedResult },
+      });
+      const actualResult = await withNetworkClient(
+        { providerType },
+        ({ makeRpcCall }) => makeRpcCall(request),
+      );
+
+      expect(actualResult).toStrictEqual(expectedResult);
+    });
+  });
+}
diff --git a/app/scripts/controllers/network/provider-api-tests/shared-tests.js b/app/scripts/controllers/network/provider-api-tests/shared-tests.js
index 4fb997915..d61595670 100644
--- a/app/scripts/controllers/network/provider-api-tests/shared-tests.js
+++ b/app/scripts/controllers/network/provider-api-tests/shared-tests.js
@@ -1,14 +1,10 @@
 /* eslint-disable jest/require-top-level-describe, jest/no-export, jest/no-identical-title */
 
-import { fill } from 'lodash';
-import {
-  withMockedCommunications,
-  withNetworkClient,
-  buildMockParams,
-  buildRequestWithReplacedBlockParam,
-} from './helpers';
-
-const originalSetTimeout = setTimeout;
+import { testsForRpcMethodsThatCheckForBlockHashInResponse } from './block-hash-in-response';
+import { testsForRpcMethodSupportingBlockParam } from './block-param';
+import { withMockedCommunications, withNetworkClient } from './helpers';
+import { testsForRpcMethodAssumingNoBlockParam } from './no-block-param';
+import { testsForRpcMethodNotHandledByMiddleware } from './not-handled-by-middleware';
 
 /**
  * Constructs an error message that the Infura client would produce in the event
@@ -17,7 +13,7 @@ const originalSetTimeout = setTimeout;
  * @param reason - The exact reason for failure.
  * @returns The error message.
  */
-function buildInfuraClientRetriesExhaustedErrorMessage(reason) {
+export function buildInfuraClientRetriesExhaustedErrorMessage(reason) {
   return new RegExp(
     `^InfuraProvider - cannot complete request. All retries exhausted\\..+${reason}`,
     'us',
@@ -31,7 +27,7 @@ function buildInfuraClientRetriesExhaustedErrorMessage(reason) {
  * @param method - The RPC method.
  * @returns The error message.
  */
-function buildJsonRpcEngineEmptyResponseErrorMessage(method) {
+export function buildJsonRpcEngineEmptyResponseErrorMessage(method) {
   return new RegExp(
     `^JsonRpcEngine: Response has no error or result for request:.+"method": "${method}"`,
     'us',
@@ -46,57 +42,13 @@ function buildJsonRpcEngineEmptyResponseErrorMessage(method) {
  * @param reason - The reason.
  * @returns The error message.
  */
-function buildFetchFailedErrorMessage(url, reason) {
+export function buildFetchFailedErrorMessage(url, reason) {
   return new RegExp(
     `^request to ${url}(/[^/ ]*)+ failed, reason: ${reason}`,
     'us',
   );
 }
 
-/**
- * Some middleware contain logic which retries the request if some condition
- * applies. This retrying always happens out of band via `setTimeout`, and
- * because we are stubbing time via Jest's fake timers, we have to manually
- * advance the clock so that the `setTimeout` handlers get fired. We don't know
- * when these timers will get created, however, so we have to keep advancing
- * timers until the request has been made an appropriate number of times.
- * Unfortunately we don't have a good way to know how many times a request has
- * been retried, but the good news is that the middleware won't end, and thus
- * the promise which the RPC call returns won't get fulfilled, until all retries
- * have been made.
- *
- * @param promise - The promise which is returned by the RPC call.
- * @param clock - A Sinon clock object which can be used to advance to the next
- * `setTimeout` handler.
- */
-async function waitForPromiseToBeFulfilledAfterRunningAllTimers(
-  promise,
-  clock,
-) {
-  let hasPromiseBeenFulfilled = false;
-  let numTimesClockHasBeenAdvanced = 0;
-
-  promise
-    .catch(() => {
-      // This is used to silence Node.js warnings about the rejection
-      // being handled asynchronously. The error is handled later when
-      // `promise` is awaited.
-    })
-    .finally(() => {
-      hasPromiseBeenFulfilled = true;
-    });
-
-  // `isPromiseFulfilled` is modified asynchronously.
-  /* eslint-disable-next-line no-unmodified-loop-condition */
-  while (!hasPromiseBeenFulfilled && numTimesClockHasBeenAdvanced < 15) {
-    clock.runAll();
-    await new Promise((resolve) => originalSetTimeout(resolve, 10));
-    numTimesClockHasBeenAdvanced += 1;
-  }
-
-  return promise;
-}
-
 /**
  * Defines tests that are common to both the Infura and JSON-RPC network client.
  *
@@ -105,7 +57,6 @@ async function waitForPromiseToBeFulfilledAfterRunningAllTimers(
  * exposed by `createInfuraClient` is tested; if `custom`, then the middleware
  * exposed by `createJsonRpcClient` will be tested.
  */
-/* eslint-disable-next-line jest/no-export */
 export function testsForProviderType(providerType) {
   // Ethereum JSON-RPC spec: <https://ethereum.github.io/execution-apis/api-documentation/>
   // Infura documentation: <https://docs.infura.io/infura/networks/ethereum/json-rpc-methods>
@@ -113,33 +64,40 @@ export function testsForProviderType(providerType) {
   describe('methods included in the Ethereum JSON-RPC spec', () => {
     describe('methods not handled by middleware', () => {
       const notHandledByMiddleware = [
-        { name: 'eth_accounts', numberOfParameters: 0 },
-        { name: 'eth_coinbase', numberOfParameters: 0 },
-        { name: 'eth_createAccessList', numberOfParameters: 2 },
-        { name: 'eth_feeHistory', numberOfParameters: 3 },
+        // This list is presented in the same order as in the network client
+        // tests on the core side.
+
+        { name: 'eth_newFilter', numberOfParameters: 1 },
         { name: 'eth_getFilterChanges', numberOfParameters: 1 },
+        { name: 'eth_newBlockFilter', numberOfParameters: 0 },
+        { name: 'eth_newPendingTransactionFilter', numberOfParameters: 0 },
+        { name: 'eth_uninstallFilter', numberOfParameters: 1 },
+
+        { name: 'eth_sendRawTransaction', numberOfParameters: 1 },
+        { name: 'eth_sendTransaction', numberOfParameters: 1 },
+        { name: 'eth_sign', numberOfParameters: 2 },
+
+        { name: 'eth_createAccessList', numberOfParameters: 2 },
         { name: 'eth_getLogs', numberOfParameters: 1 },
         { name: 'eth_getProof', numberOfParameters: 3 },
         { name: 'eth_getWork', numberOfParameters: 0 },
-        { name: 'eth_hashrate', numberOfParameters: 0 },
         { name: 'eth_maxPriorityFeePerGas', numberOfParameters: 0 },
-        { name: 'eth_mining', numberOfParameters: 0 },
-        { name: 'eth_newBlockFilter', numberOfParameters: 0 },
-        { name: 'eth_newFilter', numberOfParameters: 1 },
-        { name: 'eth_newPendingTransactionFilter', numberOfParameters: 0 },
-        { name: 'eth_sendRawTransaction', numberOfParameters: 1 },
-        { name: 'eth_signTransaction', numberOfParameters: 1 },
-        { name: 'eth_sendTransaction', numberOfParameters: 1 },
-        { name: 'eth_sign', numberOfParameters: 2 },
         { name: 'eth_submitHashRate', numberOfParameters: 2 },
         { name: 'eth_submitWork', numberOfParameters: 3 },
         { name: 'eth_syncing', numberOfParameters: 0 },
-        { name: 'eth_uninstallFilter', numberOfParameters: 1 },
+        { name: 'eth_feeHistory', numberOfParameters: 3 },
         { name: 'debug_getRawHeader', numberOfParameters: 1 },
         { name: 'debug_getRawBlock', numberOfParameters: 1 },
         { name: 'debug_getRawTransaction', numberOfParameters: 1 },
         { name: 'debug_getRawReceipts', numberOfParameters: 1 },
         { name: 'debug_getBadBlocks', numberOfParameters: 0 },
+
+        { name: 'eth_accounts', numberOfParameters: 0 },
+        { name: 'eth_coinbase', numberOfParameters: 0 },
+        { name: 'eth_hashrate', numberOfParameters: 0 },
+        { name: 'eth_mining', numberOfParameters: 0 },
+
+        { name: 'eth_signTransaction', numberOfParameters: 1 },
       ];
       notHandledByMiddleware.forEach(({ name, numberOfParameters }) => {
         describe(`method name: ${name}`, () => {
@@ -151,6 +109,63 @@ export function testsForProviderType(providerType) {
       });
     });
 
+    describe('methods with block hashes in their result', () => {
+      const methodsWithBlockHashInResponse = [
+        { name: 'eth_getTransactionByHash', numberOfParameters: 1 },
+        { name: 'eth_getTransactionReceipt', numberOfParameters: 1 },
+      ];
+      methodsWithBlockHashInResponse.forEach(({ name, numberOfParameters }) => {
+        describe(`method name: ${name}`, () => {
+          testsForRpcMethodsThatCheckForBlockHashInResponse(name, {
+            numberOfParameters,
+            providerType,
+          });
+        });
+      });
+    });
+
+    describe('methods that assume there is no block param', () => {
+      const assumingNoBlockParam = [
+        { name: 'eth_getFilterLogs', numberOfParameters: 1 },
+        { name: 'eth_blockNumber', numberOfParameters: 0 },
+        { name: 'eth_estimateGas', numberOfParameters: 2 },
+        { name: 'eth_gasPrice', numberOfParameters: 0 },
+        { name: 'eth_getBlockByHash', numberOfParameters: 2 },
+        {
+          name: 'eth_getBlockTransactionCountByHash',
+          numberOfParameters: 1,
+        },
+        {
+          name: 'eth_getTransactionByBlockHashAndIndex',
+          numberOfParameters: 2,
+        },
+        { name: 'eth_getUncleByBlockHashAndIndex', numberOfParameters: 2 },
+        { name: 'eth_getUncleCountByBlockHash', numberOfParameters: 1 },
+      ];
+      const blockParamIgnored = [
+        { name: 'eth_getUncleCountByBlockNumber', numberOfParameters: 1 },
+        { name: 'eth_getUncleByBlockNumberAndIndex', numberOfParameters: 2 },
+        {
+          name: 'eth_getTransactionByBlockNumberAndIndex',
+          numberOfParameters: 2,
+        },
+        {
+          name: 'eth_getBlockTransactionCountByNumber',
+          numberOfParameters: 1,
+        },
+      ];
+      assumingNoBlockParam
+        .concat(blockParamIgnored)
+        .forEach(({ name, numberOfParameters }) =>
+          describe(`method name: ${name}`, () => {
+            testsForRpcMethodAssumingNoBlockParam(name, {
+              providerType,
+              numberOfParameters,
+            });
+          }),
+        );
+    });
+
     describe('methods that have a param to specify the block', () => {
       const supportingBlockParam = [
         {
@@ -193,70 +208,6 @@ export function testsForProviderType(providerType) {
       );
     });
 
-    describe('methods that assume there is no block param', () => {
-      const assumingNoBlockParam = [
-        { name: 'eth_blockNumber', numberOfParameters: 0 },
-        { name: 'eth_estimateGas', numberOfParameters: 2 },
-        { name: 'eth_gasPrice', numberOfParameters: 0 },
-        { name: 'eth_getBlockByHash', numberOfParameters: 2 },
-        // NOTE: eth_getBlockTransactionCountByNumber does take a block param at
-        // the 0th index, but this is not handled by our cache middleware
-        // currently
-        {
-          name: 'eth_getBlockTransactionCountByNumber',
-          numberOfParameters: 1,
-        },
-        // NOTE: eth_getTransactionByBlockNumberAndIndex does take a block param
-        // at the 0th index, but this is not handled by our cache middleware
-        // currently
-        {
-          name: 'eth_getTransactionByBlockNumberAndIndex',
-          numberOfParameters: 2,
-        },
-        {
-          name: 'eth_getBlockTransactionCountByHash',
-          numberOfParameters: 1,
-        },
-        { name: 'eth_getFilterLogs', numberOfParameters: 1 },
-        {
-          name: 'eth_getTransactionByBlockHashAndIndex',
-          numberOfParameters: 2,
-        },
-        { name: 'eth_getUncleByBlockHashAndIndex', numberOfParameters: 2 },
-        // NOTE: eth_getUncleByBlockNumberAndIndex does take a block param at
-        // the 0th index, but this is not handled by our cache middleware
-        // currently
-        { name: 'eth_getUncleByBlockNumberAndIndex', numberOfParameters: 2 },
-        { name: 'eth_getUncleCountByBlockHash', numberOfParameters: 1 },
-        // NOTE: eth_getUncleCountByBlockNumber does take a block param at the
-        // 0th index, but this is not handled by our cache middleware currently
-        { name: 'eth_getUncleCountByBlockNumber', numberOfParameters: 1 },
-      ];
-      assumingNoBlockParam.forEach(({ name, numberOfParameters }) =>
-        describe(`method name: ${name}`, () => {
-          testsForRpcMethodAssumingNoBlockParam(name, {
-            providerType,
-            numberOfParameters,
-          });
-        }),
-      );
-    });
-
-    describe('methods with block hashes in their result', () => {
-      const methodsWithBlockHashInResponse = [
-        { name: 'eth_getTransactionByHash', numberOfParameters: 1 },
-        { name: 'eth_getTransactionReceipt', numberOfParameters: 1 },
-      ];
-      methodsWithBlockHashInResponse.forEach(({ name, numberOfParameters }) => {
-        describe(`method name: ${name}`, () => {
-          testsForRpcMethodsThatCheckForBlockHashInResponse(name, {
-            numberOfParameters,
-            providerType,
-          });
-        });
-      });
-    });
-
     describe('other methods', () => {
       describe('eth_getTransactionByHash', () => {
         it("refreshes the block tracker's current block if it is less than the block number that comes back in the response", async () => {
@@ -336,10 +287,14 @@ export function testsForProviderType(providerType) {
   describe('methods not included in the Ethereum JSON-RPC spec', () => {
     describe('methods not handled by middleware', () => {
       const notHandledByMiddleware = [
-        { name: 'custom_rpc_method', numberOfParameters: 1 },
+        // This list is presented in the same order as in the network client
+        // tests on the core side.
+
+        { name: 'net_listening', numberOfParameters: 0 },
+
         { name: 'eth_subscribe', numberOfParameters: 1 },
         { name: 'eth_unsubscribe', numberOfParameters: 1 },
-        { name: 'net_listening', numberOfParameters: 0 },
+        { name: 'custom_rpc_method', numberOfParameters: 1 },
         { name: 'net_peerCount', numberOfParameters: 0 },
         { name: 'parity_nextNonce', numberOfParameters: 1 },
       ];
@@ -355,8 +310,8 @@ export function testsForProviderType(providerType) {
 
     describe('methods that assume there is no block param', () => {
       const assumingNoBlockParam = [
-        { name: 'eth_protocolVersion', numberOfParameters: 0 },
         { name: 'web3_clientVersion', numberOfParameters: 0 },
+        { name: 'eth_protocolVersion', numberOfParameters: 0 },
       ];
       assumingNoBlockParam.forEach(({ name, numberOfParameters }) =>
         describe(`method name: ${name}`, () => {
@@ -412,3252 +367,3 @@ export function testsForProviderType(providerType) {
     });
   });
 }
-
-/**
- * Defines tests which exercise the behavior exhibited by an RPC method that
- * is not handled specially by the network client middleware.
- *
- * @param method - The name of the RPC method under test.
- * @param additionalArgs - Additional arguments.
- * @param additionalArgs.providerType - The type of provider being tested;
- * either `infura` or `custom`.
- * @param additionalArgs.numberOfParameters - The number of parameters that this
- * RPC method takes.
- */
-/* eslint-disable-next-line jest/no-export */
-export function testsForRpcMethodNotHandledByMiddleware(
-  method,
-  { providerType, numberOfParameters },
-) {
-  if (providerType !== 'infura' && providerType !== 'custom') {
-    throw new Error(
-      `providerType must be either "infura" or "custom", was "${providerType}" instead`,
-    );
-  }
-
-  it('attempts to pass the request off to the RPC endpoint', async () => {
-    const request = {
-      method,
-      params: fill(Array(numberOfParameters), 'some value'),
-    };
-    const expectedResult = 'the result';
-
-    await withMockedCommunications({ providerType }, async (comms) => {
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      comms.mockRpcCall({
-        request,
-        response: { result: expectedResult },
-      });
-      const actualResult = await withNetworkClient(
-        { providerType },
-        ({ makeRpcCall }) => makeRpcCall(request),
-      );
-
-      expect(actualResult).toStrictEqual(expectedResult);
-    });
-  });
-}
-
-/**
- * Defines tests which exercise the behavior exhibited by an RPC method which is
- * assumed to not take a block parameter. Even if it does, the value of this
- * parameter will not be used in determining how to cache the method.
- *
- * @param method - The name of the RPC method under test.
- * @param additionalArgs - Additional arguments.
- * @param additionalArgs.numberOfParameters - The number of parameters supported by the method under test.
- * @param additionalArgs.providerType - The type of provider being tested;
- * either `infura` or `custom` (default: "infura").
- */
-export function testsForRpcMethodAssumingNoBlockParam(
-  method,
-  { numberOfParameters, providerType },
-) {
-  if (providerType !== 'infura' && providerType !== 'custom') {
-    throw new Error(
-      `providerType must be either "infura" or "custom", was "${providerType}" instead`,
-    );
-  }
-
-  it('does not hit the RPC endpoint more than once for identical requests', async () => {
-    const requests = [{ method }, { method }];
-    const mockResults = ['first result', 'second result'];
-
-    await withMockedCommunications({ providerType }, async (comms) => {
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      comms.mockRpcCall({
-        request: requests[0],
-        response: { result: mockResults[0] },
-      });
-
-      const results = await withNetworkClient(
-        { providerType },
-        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-      );
-
-      expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
-    });
-  });
-
-  for (const paramIndex of [...Array(numberOfParameters).keys()]) {
-    it(`does not reuse the result of a previous request if parameter at index "${paramIndex}" differs`, async () => {
-      const firstMockParams = [
-        ...new Array(numberOfParameters).fill('some value'),
-      ];
-      const secondMockParams = firstMockParams.slice();
-      secondMockParams[paramIndex] = 'another value';
-      const requests = [
-        {
-          method,
-          params: firstMockParams,
-        },
-        { method, params: secondMockParams },
-      ];
-      const mockResults = ['some result', 'another result'];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request: requests[0],
-          response: { result: mockResults[0] },
-        });
-        comms.mockRpcCall({
-          request: requests[1],
-          response: { result: mockResults[1] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-        );
-
-        expect(results).toStrictEqual([mockResults[0], mockResults[1]]);
-      });
-    });
-  }
-
-  it('hits the RPC endpoint and does not reuse the result of a previous request if the latest block number was updated since', async () => {
-    const requests = [{ method }, { method }];
-    const mockResults = ['first result', 'second result'];
-
-    await withMockedCommunications({ providerType }, async (comms) => {
-      // Note that we have to mock these requests in a specific order. The
-      // first block tracker request occurs because of the first RPC request.
-      // The second block tracker request, however, does not occur because of
-      // the second RPC request, but rather because we call `clock.runAll()`
-      // below.
-      comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' });
-      comms.mockRpcCall({
-        request: requests[0],
-        response: { result: mockResults[0] },
-      });
-      comms.mockNextBlockTrackerRequest({ blockNumber: '0x2' });
-      comms.mockRpcCall({
-        request: requests[1],
-        response: { result: mockResults[1] },
-      });
-
-      const results = await withNetworkClient(
-        { providerType },
-        async (client) => {
-          const firstResult = await client.makeRpcCall(requests[0]);
-          // Proceed to the next iteration of the block tracker so that a new
-          // block is fetched and the current block is updated.
-          client.clock.runAll();
-          const secondResult = await client.makeRpcCall(requests[1]);
-          return [firstResult, secondResult];
-        },
-      );
-
-      expect(results).toStrictEqual(mockResults);
-    });
-  });
-
-  for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
-    it(`does not retry an empty response of "${emptyValue}"`, async () => {
-      const request = { method };
-      const mockResult = emptyValue;
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          response: { result: mockResult },
-        });
-
-        const result = await withNetworkClient(
-          { providerType },
-          ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        expect(result).toStrictEqual(mockResult);
-      });
-    });
-
-    it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
-      const requests = [{ method }, { method }];
-      const mockResults = [emptyValue, 'some result'];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request: requests[0],
-          response: { result: mockResults[0] },
-        });
-        comms.mockRpcCall({
-          request: requests[1],
-          response: { result: mockResults[1] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-        );
-
-        expect(results).toStrictEqual(mockResults);
-      });
-    });
-  }
-
-  it('queues requests while a previous identical call is still pending, then runs the queue when it finishes, reusing the result from the first request', async () => {
-    const requests = [{ method }, { method }, { method }];
-    const mockResults = ['first result', 'second result', 'third result'];
-
-    await withMockedCommunications({ providerType }, async (comms) => {
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      comms.mockRpcCall({
-        request: requests[0],
-        response: { result: mockResults[0] },
-        delay: 100,
-      });
-      comms.mockRpcCall({
-        request: requests[1],
-        response: { result: mockResults[1] },
-      });
-      comms.mockRpcCall({
-        request: requests[2],
-        response: { result: mockResults[2] },
-      });
-
-      const results = await withNetworkClient(
-        { providerType },
-        async (client) => {
-          const resultPromises = [
-            client.makeRpcCall(requests[0]),
-            client.makeRpcCall(requests[1]),
-            client.makeRpcCall(requests[2]),
-          ];
-          const firstResult = await resultPromises[0];
-          // The inflight cache middleware uses setTimeout to run the handlers,
-          // so run them now
-          client.clock.runAll();
-          const remainingResults = await Promise.all(resultPromises.slice(1));
-          return [firstResult, ...remainingResults];
-        },
-      );
-
-      expect(results).toStrictEqual([
-        mockResults[0],
-        mockResults[0],
-        mockResults[0],
-      ]);
-    });
-  });
-
-  it('throws a custom error if the request to the RPC endpoint returns a 405 response', async () => {
-    await withMockedCommunications({ providerType }, async (comms) => {
-      const request = { method };
-
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      comms.mockRpcCall({
-        request,
-        response: {
-          httpStatus: 405,
-        },
-      });
-      const promiseForResult = withNetworkClient(
-        { providerType },
-        async ({ makeRpcCall }) => makeRpcCall(request),
-      );
-
-      await expect(promiseForResult).rejects.toThrow(
-        'The method does not exist / is not available',
-      );
-    });
-  });
-
-  // There is a difference in how we are testing the Infura middleware vs. the
-  // custom RPC middleware (or, more specifically, the fetch middleware) because
-  // of what both middleware treat as rate limiting errors. In this case, the
-  // fetch middleware treats a 418 response from the RPC endpoint as such an
-  // error, whereas to the Infura middleware, it is a 429 response.
-  if (providerType === 'infura') {
-    it('throws an undescriptive error if the request to the RPC endpoint returns a 418 response', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          response: {
-            httpStatus: 418,
-          },
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          '{"id":1,"jsonrpc":"2.0"}',
-        );
-      });
-    });
-
-    it('throws an error with a custom message if the request to the RPC endpoint returns a 429 response', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          response: {
-            httpStatus: 429,
-          },
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          'Request is being rate limited',
-        );
-      });
-    });
-  } else {
-    it('throws a custom error if the request to the RPC endpoint returns a 418 response', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          response: {
-            httpStatus: 418,
-          },
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          'Request is being rate limited.',
-        );
-      });
-    });
-
-    it('throws an undescriptive error if the request to the RPC endpoint returns a 429 response', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          response: {
-            httpStatus: 429,
-          },
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          "Non-200 status code: '429'",
-        );
-      });
-    });
-  }
-
-  it('throws a generic, undescriptive error if the request to the RPC endpoint returns a response that is not 405, 418, 429, 503, or 504', async () => {
-    await withMockedCommunications({ providerType }, async (comms) => {
-      const request = { method };
-
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      comms.mockRpcCall({
-        request,
-        response: {
-          id: 12345,
-          jsonrpc: '2.0',
-          error: 'some error',
-          httpStatus: 420,
-        },
-      });
-      const promiseForResult = withNetworkClient(
-        { providerType },
-        async ({ makeRpcCall }) => makeRpcCall(request),
-      );
-
-      const errorMessage =
-        providerType === 'infura'
-          ? '{"id":12345,"jsonrpc":"2.0","error":"some error"}'
-          : "Non-200 status code: '420'";
-      await expect(promiseForResult).rejects.toThrow(errorMessage);
-    });
-  });
-
-  [503, 504].forEach((httpStatus) => {
-    it(`retries the request to the RPC endpoint up to 5 times if it returns a ${httpStatus} response, returning the successful result if there is one on the 5th try`, async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        // Here we have the request fail for the first 4 tries, then succeed
-        // on the 5th try.
-        comms.mockRpcCall({
-          request,
-          response: {
-            error: 'Some error',
-            httpStatus,
-          },
-          times: 4,
-        });
-        comms.mockRpcCall({
-          request,
-          response: {
-            result: 'the result',
-            httpStatus: 200,
-          },
-        });
-        const result = await withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        expect(result).toStrictEqual('the result');
-      });
-    });
-
-    it(`causes a request to fail with a custom error if the request to the RPC endpoint returns a ${httpStatus} response 5 times in a row`, async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          response: {
-            error: 'Some error',
-            httpStatus,
-          },
-          times: 5,
-        });
-        comms.mockNextBlockTrackerRequest();
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-        const err =
-          providerType === 'infura'
-            ? buildInfuraClientRetriesExhaustedErrorMessage('Gateway timeout')
-            : buildJsonRpcEngineEmptyResponseErrorMessage(method);
-        await expect(promiseForResult).rejects.toThrow(err);
-      });
-    });
-  });
-
-  it('retries the request to the RPC endpoint up to 5 times if an "ETIMEDOUT" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-    await withMockedCommunications({ providerType }, async (comms) => {
-      const request = { method };
-
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      // Here we have the request fail for the first 4 tries, then succeed
-      // on the 5th try.
-      comms.mockRpcCall({
-        request,
-        error: 'ETIMEDOUT: Some message',
-        times: 4,
-      });
-      comms.mockRpcCall({
-        request,
-        response: {
-          result: 'the result',
-          httpStatus: 200,
-        },
-      });
-
-      const result = await withNetworkClient(
-        { providerType },
-        async ({ makeRpcCall, clock }) => {
-          return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-            makeRpcCall(request),
-            clock,
-          );
-        },
-      );
-
-      expect(result).toStrictEqual('the result');
-    });
-  });
-
-  // Both the Infura and fetch middleware detect ETIMEDOUT errors and will
-  // automatically retry the request to the RPC endpoint in question, but both
-  // produce a different error if the number of retries is exhausted.
-  if (providerType === 'infura') {
-    it('causes a request to fail with a custom error if an "ETIMEDOUT" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-        const errorMessage = 'ETIMEDOUT: Some message';
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          error: errorMessage,
-          times: 5,
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
-        );
-      });
-    });
-  } else {
-    it('returns an empty response if an "ETIMEDOUT" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-        const errorMessage = 'ETIMEDOUT: Some message';
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          error: errorMessage,
-          times: 5,
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          buildJsonRpcEngineEmptyResponseErrorMessage(method),
-        );
-      });
-    });
-  }
-
-  // The Infura middleware treats a response that contains an ECONNRESET message
-  // as an innocuous error that is likely to disappear on a retry. The custom
-  // RPC middleware, on the other hand, does not specially handle this error.
-  if (providerType === 'infura') {
-    it('retries the request to the RPC endpoint up to 5 times if an "ECONNRESET" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        // Here we have the request fail for the first 4 tries, then succeed
-        // on the 5th try.
-        comms.mockRpcCall({
-          request,
-          error: 'ECONNRESET: Some message',
-          times: 4,
-        });
-        comms.mockRpcCall({
-          request,
-          response: {
-            result: 'the result',
-            httpStatus: 200,
-          },
-        });
-
-        const result = await withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        expect(result).toStrictEqual('the result');
-      });
-    });
-
-    it('causes a request to fail with a custom error if an "ECONNRESET" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-        const errorMessage = 'ECONNRESET: Some message';
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          error: errorMessage,
-          times: 5,
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
-        );
-      });
-    });
-  } else {
-    it('does not retry the request to the RPC endpoint, but throws immediately, if an "ECONNRESET" error is thrown while making the request', async () => {
-      const customRpcUrl = 'http://example.com';
-
-      await withMockedCommunications(
-        { providerType, customRpcUrl },
-        async (comms) => {
-          const request = { method };
-          const errorMessage = 'ECONNRESET: Some message';
-
-          // The first time a block-cacheable request is made, the latest block
-          // number is retrieved through the block tracker first. It doesn't
-          // matter what this is — it's just used as a cache key.
-          comms.mockNextBlockTrackerRequest();
-          comms.mockRpcCall({
-            request,
-            error: errorMessage,
-          });
-          const promiseForResult = withNetworkClient(
-            { providerType, customRpcUrl },
-            async ({ makeRpcCall }) => makeRpcCall(request),
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildFetchFailedErrorMessage(customRpcUrl, errorMessage),
-          );
-        },
-      );
-    });
-  }
-
-  // Both the Infura and fetch middleware will attempt to parse the response
-  // body as JSON, and if this step produces an error, both middleware will also
-  // attempt to retry the request. However, this error handling code is slightly
-  // different between the two. As the error in this case is a SyntaxError, the
-  // Infura middleware will catch it immediately, whereas the custom RPC
-  // middleware will catch it and re-throw a separate error, which it then
-  // catches later.
-  if (providerType === 'infura') {
-    it('retries the request to the RPC endpoint up to 5 times if an "SyntaxError" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        // Here we have the request fail for the first 4 tries, then succeed
-        // on the 5th try.
-        comms.mockRpcCall({
-          request,
-          error: 'SyntaxError: Some message',
-          times: 4,
-        });
-        comms.mockRpcCall({
-          request,
-          response: {
-            result: 'the result',
-            httpStatus: 200,
-          },
-        });
-
-        const result = await withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        expect(result).toStrictEqual('the result');
-      });
-    });
-
-    it('causes a request to fail with a custom error if an "SyntaxError" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-        const errorMessage = 'SyntaxError: Some message';
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          error: errorMessage,
-          times: 5,
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
-        );
-      });
-    });
-
-    it('does not retry the request to the RPC endpoint, but throws immediately, if a "failed to parse response body" error is thrown while making the request', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-        const errorMessage = 'failed to parse response body: some message';
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          error: errorMessage,
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType, infuraNetwork: comms.infuraNetwork },
-          async ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          buildFetchFailedErrorMessage(comms.rpcUrl, errorMessage),
-        );
-      });
-    });
-  } else {
-    it('does not retry the request to the RPC endpoint, but throws immediately, if a "SyntaxError" error is thrown while making the request', async () => {
-      const customRpcUrl = 'http://example.com';
-
-      await withMockedCommunications(
-        { providerType, customRpcUrl },
-        async (comms) => {
-          const request = { method };
-          const errorMessage = 'SyntaxError: Some message';
-
-          // The first time a block-cacheable request is made, the latest block
-          // number is retrieved through the block tracker first. It doesn't
-          // matter what this is — it's just used as a cache key.
-          comms.mockNextBlockTrackerRequest();
-          comms.mockRpcCall({
-            request,
-            error: errorMessage,
-          });
-          const promiseForResult = withNetworkClient(
-            { providerType, customRpcUrl },
-            async ({ makeRpcCall }) => makeRpcCall(request),
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildFetchFailedErrorMessage(customRpcUrl, errorMessage),
-          );
-        },
-      );
-    });
-
-    it('retries the request to the RPC endpoint up to 5 times if a "failed to parse response body" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        // Here we have the request fail for the first 4 tries, then succeed
-        // on the 5th try.
-        comms.mockRpcCall({
-          request,
-          error: 'failed to parse response body: some message',
-          times: 4,
-        });
-        comms.mockRpcCall({
-          request,
-          response: {
-            result: 'the result',
-            httpStatus: 200,
-          },
-        });
-
-        const result = await withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        expect(result).toStrictEqual('the result');
-      });
-    });
-
-    it('returns an empty response if a "failed to parse response body" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-        const errorMessage = 'failed to parse response body: some message';
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          error: errorMessage,
-          times: 5,
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          buildJsonRpcEngineEmptyResponseErrorMessage(method),
-        );
-      });
-    });
-  }
-
-  // Only the custom RPC middleware will detect a "Failed to fetch" error and
-  // attempt to retry the request to the RPC endpoint; the Infura middleware
-  // does not.
-  if (providerType === 'infura') {
-    it('does not retry the request to the RPC endpoint, but throws immediately, if a "Failed to fetch" error is thrown while making the request', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-        const errorMessage = 'Failed to fetch: some message';
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          error: errorMessage,
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType, infuraNetwork: comms.infuraNetwork },
-          async ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          buildFetchFailedErrorMessage(comms.rpcUrl, errorMessage),
-        );
-      });
-    });
-  } else {
-    it('retries the request to the RPC endpoint up to 5 times if a "Failed to fetch" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        // Here we have the request fail for the first 4 tries, then succeed
-        // on the 5th try.
-        comms.mockRpcCall({
-          request,
-          error: 'Failed to fetch: some message',
-          times: 4,
-        });
-        comms.mockRpcCall({
-          request,
-          response: {
-            result: 'the result',
-            httpStatus: 200,
-          },
-        });
-
-        const result = await withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        expect(result).toStrictEqual('the result');
-      });
-    });
-
-    it('returns an empty response if a "Failed to fetch" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-        const errorMessage = 'Failed to fetch: some message';
-
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          error: errorMessage,
-          times: 5,
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          buildJsonRpcEngineEmptyResponseErrorMessage(method),
-        );
-      });
-    });
-  }
-}
-
-/**
- * Defines tests which exercise the behavior exhibited by an RPC method that
- * use `blockHash` in the response data to determine whether the response is
- * cacheable.
- *
- * @param method - The name of the RPC method under test.
- * @param additionalArgs - Additional arguments.
- * @param additionalArgs.numberOfParameters - The number of parameters supported by the method under test.
- * @param additionalArgs.providerType - The type of provider being tested;
- * either `infura` or `custom` (default: "infura").
- */
-export function testsForRpcMethodsThatCheckForBlockHashInResponse(
-  method,
-  { numberOfParameters, providerType },
-) {
-  if (providerType !== 'infura' && providerType !== 'custom') {
-    throw new Error(
-      `providerType must be either "infura" or "custom", was "${providerType}" instead`,
-    );
-  }
-
-  it('does not hit the RPC endpoint more than once for identical requests and it has a valid blockHash', async () => {
-    const requests = [{ method }, { method }];
-    const mockResult = { blockHash: '0x100' };
-
-    await withMockedCommunications({ providerType }, async (comms) => {
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      comms.mockRpcCall({
-        request: requests[0],
-        response: { result: mockResult },
-      });
-
-      const results = await withNetworkClient(
-        { providerType },
-        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-      );
-
-      expect(results).toStrictEqual([mockResult, mockResult]);
-    });
-  });
-
-  for (const paramIndex of [...Array(numberOfParameters).keys()]) {
-    it(`does not reuse the result of a previous request with a valid blockHash if parameter at index "${paramIndex}" differs`, async () => {
-      const firstMockParams = [
-        ...new Array(numberOfParameters).fill('some value'),
-      ];
-      const secondMockParams = firstMockParams.slice();
-      secondMockParams[paramIndex] = 'another value';
-      const requests = [
-        {
-          method,
-          params: firstMockParams,
-        },
-        { method, params: secondMockParams },
-      ];
-      const mockResults = [{ blockHash: '0x100' }, { blockHash: '0x200' }];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request: requests[0],
-          response: { result: mockResults[0] },
-        });
-        comms.mockRpcCall({
-          request: requests[1],
-          response: { result: mockResults[1] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-        );
-
-        expect(results).toStrictEqual([mockResults[0], mockResults[1]]);
-      });
-    });
-  }
-
-  it('hits the RPC endpoint and does not reuse the result of a previous request if the latest block number was updated since', async () => {
-    const requests = [{ method }, { method }];
-    const mockResults = [{ blockHash: '0x100' }, { blockHash: '0x200' }];
-
-    await withMockedCommunications({ providerType }, async (comms) => {
-      // Note that we have to mock these requests in a specific order. The
-      // first block tracker request occurs because of the first RPC
-      // request. The second block tracker request, however, does not occur
-      // because of the second RPC request, but rather because we call
-      // `clock.runAll()` below.
-      comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' });
-      comms.mockRpcCall({
-        request: requests[0],
-        response: { result: mockResults[0] },
-      });
-      comms.mockNextBlockTrackerRequest({ blockNumber: '0x2' });
-      comms.mockRpcCall({
-        request: requests[1],
-        response: { result: mockResults[1] },
-      });
-
-      const results = await withNetworkClient(
-        { providerType },
-        async (client) => {
-          const firstResult = await client.makeRpcCall(requests[0]);
-          // Proceed to the next iteration of the block tracker so that a new
-          // block is fetched and the current block is updated.
-          client.clock.runAll();
-          const secondResult = await client.makeRpcCall(requests[1]);
-          return [firstResult, secondResult];
-        },
-      );
-
-      expect(results).toStrictEqual(mockResults);
-    });
-  });
-
-  for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
-    it(`does not retry an empty response of "${emptyValue}"`, async () => {
-      const request = { method };
-      const mockResult = emptyValue;
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request,
-          response: { result: mockResult },
-        });
-
-        const result = await withNetworkClient(
-          { providerType },
-          ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        expect(result).toStrictEqual(mockResult);
-      });
-    });
-
-    it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
-      const requests = [{ method }, { method }];
-      const mockResults = [emptyValue, { blockHash: '0x100' }];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the latest block
-        // number is retrieved through the block tracker first. It doesn't
-        // matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request: requests[0],
-          response: { result: mockResults[0] },
-        });
-        comms.mockRpcCall({
-          request: requests[1],
-          response: { result: mockResults[1] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-        );
-
-        expect(results).toStrictEqual(mockResults);
-      });
-    });
-  }
-
-  it('does not reuse the result of a previous request if result.blockHash was null', async () => {
-    const requests = [{ method }, { method }];
-    const mockResults = [
-      { blockHash: null, extra: 'some value' },
-      { blockHash: '0x100', extra: 'some other value' },
-    ];
-
-    await withMockedCommunications({ providerType }, async (comms) => {
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      comms.mockRpcCall({
-        request: requests[0],
-        response: { result: mockResults[0] },
-      });
-      comms.mockRpcCall({
-        request: requests[1],
-        response: { result: mockResults[1] },
-      });
-
-      const results = await withNetworkClient(
-        { providerType },
-        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-      );
-
-      expect(results).toStrictEqual(mockResults);
-    });
-  });
-
-  it('does not reuse the result of a previous request if result.blockHash was undefined', async () => {
-    const requests = [{ method }, { method }];
-    const mockResults = [
-      { extra: 'some value' },
-      { blockHash: '0x100', extra: 'some other value' },
-    ];
-
-    await withMockedCommunications({ providerType }, async (comms) => {
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      comms.mockRpcCall({
-        request: requests[0],
-        response: { result: mockResults[0] },
-      });
-      comms.mockRpcCall({
-        request: requests[1],
-        response: { result: mockResults[1] },
-      });
-
-      const results = await withNetworkClient(
-        { providerType },
-        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-      );
-
-      expect(results).toStrictEqual(mockResults);
-    });
-  });
-
-  it('does not reuse the result of a previous request if result.blockHash was "0x0000000000000000000000000000000000000000000000000000000000000000"', async () => {
-    const requests = [{ method }, { method }];
-    const mockResults = [
-      {
-        blockHash:
-          '0x0000000000000000000000000000000000000000000000000000000000000000',
-        extra: 'some value',
-      },
-      { blockHash: '0x100', extra: 'some other value' },
-    ];
-
-    await withMockedCommunications({ providerType }, async (comms) => {
-      // The first time a block-cacheable request is made, the latest block
-      // number is retrieved through the block tracker first. It doesn't
-      // matter what this is — it's just used as a cache key.
-      comms.mockNextBlockTrackerRequest();
-      comms.mockRpcCall({
-        request: requests[0],
-        response: { result: mockResults[0] },
-      });
-      comms.mockRpcCall({
-        request: requests[1],
-        response: { result: mockResults[1] },
-      });
-
-      const results = await withNetworkClient(
-        { providerType },
-        ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-      );
-
-      expect(results).toStrictEqual(mockResults);
-    });
-  });
-}
-
-/**
- * Defines tests which exercise the behavior exhibited by an RPC method that
- * takes a block parameter. The value of this parameter can be either a block
- * number or a block tag ("latest", "earliest", or "pending") and affects how
- * the method is cached.
- *
- * @param method - The name of the RPC method under test.
- * @param additionalArgs - Additional arguments.
- * @param additionalArgs.blockParamIndex - The index of the block parameter.
- * @param additionalArgs.numberOfParameters - The number of parameters supported by the method under test.
- * @param additionalArgs.providerType - The type of provider being tested.
- * either `infura` or `custom` (default: "infura").
- */
-/* eslint-disable-next-line jest/no-export */
-export function testsForRpcMethodSupportingBlockParam(
-  method,
-  { blockParamIndex, numberOfParameters, providerType },
-) {
-  describe.each([
-    ['given no block tag', undefined],
-    ['given a block tag of "latest"', 'latest'],
-  ])('%s', (_desc, blockParam) => {
-    it('does not hit the RPC endpoint more than once for identical requests', async () => {
-      const requests = [
-        {
-          method,
-          params: buildMockParams({ blockParamIndex, blockParam }),
-        },
-        { method, params: buildMockParams({ blockParamIndex, blockParam }) },
-      ];
-      const mockResults = ['first result', 'second result'];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the block-cache
-        // middleware will request the latest block number through the block
-        // tracker to determine the cache key. Later, the block-ref
-        // middleware will request the latest block number again to resolve
-        // the value of "latest", but the block number is cached once made,
-        // so we only need to mock the request once.
-        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-        // The block-ref middleware will make the request as specified
-        // except that the block param is replaced with the latest block
-        // number.
-        comms.mockRpcCall({
-          request: buildRequestWithReplacedBlockParam(
-            requests[0],
-            blockParamIndex,
-            '0x100',
-          ),
-          response: { result: mockResults[0] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-        );
-
-        expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
-      });
-    });
-
-    for (const paramIndex of [...Array(numberOfParameters).keys()]) {
-      if (paramIndex === blockParamIndex) {
-        // testing changes in block param is covered under later tests
-        continue;
-      }
-      it(`does not reuse the result of a previous request if parameter at index "${paramIndex}" differs`, async () => {
-        const firstMockParams = [
-          ...new Array(numberOfParameters).fill('some value'),
-        ];
-        firstMockParams[blockParamIndex] = blockParam;
-        const secondMockParams = firstMockParams.slice();
-        secondMockParams[paramIndex] = 'another value';
-        const requests = [
-          {
-            method,
-            params: firstMockParams,
-          },
-          { method, params: secondMockParams },
-        ];
-        const mockResults = ['first result', 'second result'];
-
-        await withMockedCommunications({ providerType }, async (comms) => {
-          // The first time a block-cacheable request is made, the block-cache
-          // middleware will request the latest block number through the block
-          // tracker to determine the cache key. Later, the block-ref
-          // middleware will request the latest block number again to resolve
-          // the value of "latest", but the block number is cached once made,
-          // so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              requests[0],
-              blockParamIndex,
-              '0x100',
-            ),
-            response: { result: mockResults[0] },
-          });
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              requests[1],
-              blockParamIndex,
-              '0x100',
-            ),
-            response: { result: mockResults[1] },
-          });
-
-          const results = await withNetworkClient(
-            { providerType },
-            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-          );
-
-          expect(results).toStrictEqual([mockResults[0], mockResults[1]]);
-        });
-      });
-    }
-
-    it('hits the RPC endpoint and does not reuse the result of a previous request if the latest block number was updated since', async () => {
-      const requests = [
-        { method, params: buildMockParams({ blockParamIndex, blockParam }) },
-        { method, params: buildMockParams({ blockParamIndex, blockParam }) },
-      ];
-      const mockResults = ['first result', 'second result'];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // Note that we have to mock these requests in a specific order.
-        // The first block tracker request occurs because of the first RPC
-        // request. The second block tracker request, however, does not
-        // occur because of the second RPC request, but rather because we
-        // call `clock.runAll()` below.
-        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-        // The block-ref middleware will make the request as specified
-        // except that the block param is replaced with the latest block
-        // number.
-        comms.mockRpcCall({
-          request: buildRequestWithReplacedBlockParam(
-            requests[0],
-            blockParamIndex,
-            '0x100',
-          ),
-          response: { result: mockResults[0] },
-        });
-        comms.mockNextBlockTrackerRequest({ blockNumber: '0x200' });
-        comms.mockRpcCall({
-          request: buildRequestWithReplacedBlockParam(
-            requests[1],
-            blockParamIndex,
-            '0x200',
-          ),
-          response: { result: mockResults[1] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          async (client) => {
-            const firstResult = await client.makeRpcCall(requests[0]);
-            // Proceed to the next iteration of the block tracker so that a
-            // new block is fetched and the current block is updated.
-            client.clock.runAll();
-            const secondResult = await client.makeRpcCall(requests[1]);
-            return [firstResult, secondResult];
-          },
-        );
-
-        expect(results).toStrictEqual(mockResults);
-      });
-    });
-
-    for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
-      it(`does not retry an empty response of "${emptyValue}"`, async () => {
-        const request = {
-          method,
-          params: buildMockParams({ blockParamIndex, blockParam }),
-        };
-        const mockResult = emptyValue;
-
-        await withMockedCommunications({ providerType }, async (comms) => {
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: { result: mockResult },
-          });
-
-          const result = await withNetworkClient(
-            { providerType },
-            ({ makeRpcCall }) => makeRpcCall(request),
-          );
-
-          expect(result).toStrictEqual(mockResult);
-        });
-      });
-
-      it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
-        const requests = [
-          { method, params: buildMockParams({ blockParamIndex, blockParam }) },
-          { method, params: buildMockParams({ blockParamIndex, blockParam }) },
-        ];
-        const mockResults = [emptyValue, 'some result'];
-
-        await withMockedCommunications({ providerType }, async (comms) => {
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              requests[0],
-              blockParamIndex,
-              '0x100',
-            ),
-            response: { result: mockResults[0] },
-          });
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              requests[1],
-              blockParamIndex,
-              '0x100',
-            ),
-            response: { result: mockResults[1] },
-          });
-
-          const results = await withNetworkClient(
-            { providerType },
-            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-          );
-
-          expect(results).toStrictEqual(mockResults);
-        });
-      });
-    }
-
-    it('queues requests while a previous identical call is still pending, then runs the queue when it finishes, reusing the result from the first request', async () => {
-      const requests = [{ method }, { method }, { method }];
-      const mockResults = ['first result', 'second result', 'third result'];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the
-        // block-cache middleware will request the latest block number
-        // through the block tracker to determine the cache key. Later,
-        // the block-ref middleware will request the latest block number
-        // again to resolve the value of "latest", but the block number is
-        // cached once made, so we only need to mock the request once.
-        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-        // The block-ref middleware will make the request as specified
-        // except that the block param is replaced with the latest block
-        // number, and we delay it.
-        comms.mockRpcCall({
-          delay: 100,
-          request: buildRequestWithReplacedBlockParam(
-            requests[0],
-            blockParamIndex,
-            '0x100',
-          ),
-          response: { result: mockResults[0] },
-        });
-        // The previous two requests will happen again, in the same order.
-        comms.mockRpcCall({
-          request: buildRequestWithReplacedBlockParam(
-            requests[1],
-            blockParamIndex,
-            '0x100',
-          ),
-          response: { result: mockResults[1] },
-        });
-        comms.mockRpcCall({
-          request: buildRequestWithReplacedBlockParam(
-            requests[2],
-            blockParamIndex,
-            '0x100',
-          ),
-          response: { result: mockResults[2] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          async (client) => {
-            const resultPromises = [
-              client.makeRpcCall(requests[0]),
-              client.makeRpcCall(requests[1]),
-              client.makeRpcCall(requests[2]),
-            ];
-            const firstResult = await resultPromises[0];
-            // The inflight cache middleware uses setTimeout to run the
-            // handlers, so run them now
-            client.clock.runAll();
-            const remainingResults = await Promise.all(resultPromises.slice(1));
-            return [firstResult, ...remainingResults];
-          },
-        );
-
-        expect(results).toStrictEqual([
-          mockResults[0],
-          mockResults[0],
-          mockResults[0],
-        ]);
-      });
-    });
-
-    it('throws an error with a custom message if the request to the RPC endpoint returns a 405 response', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the
-        // block-cache middleware will request the latest block number
-        // through the block tracker to determine the cache key. Later,
-        // the block-ref middleware will request the latest block number
-        // again to resolve the value of "latest", but the block number is
-        // cached once made, so we only need to mock the request once.
-        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-        // The block-ref middleware will make the request as specified
-        // except that the block param is replaced with the latest block
-        // number.
-        comms.mockRpcCall({
-          request: buildRequestWithReplacedBlockParam(
-            request,
-            blockParamIndex,
-            '0x100',
-          ),
-          response: {
-            httpStatus: 405,
-          },
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        await expect(promiseForResult).rejects.toThrow(
-          'The method does not exist / is not available',
-        );
-      });
-    });
-
-    // There is a difference in how we are testing the Infura middleware vs. the
-    // custom RPC middleware (or, more specifically, the fetch middleware)
-    // because of what both middleware treat as rate limiting errors. In this
-    // case, the fetch middleware treats a 418 response from the RPC endpoint as
-    // such an error, whereas to the Infura middleware, it is a 429 response.
-    if (providerType === 'infura') {
-      it('throws a generic, undescriptive error if the request to the RPC endpoint returns a 418 response', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              httpStatus: 418,
-            },
-          });
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall }) => makeRpcCall(request),
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            '{"id":1,"jsonrpc":"2.0"}',
-          );
-        });
-      });
-
-      it('throws an error with a custom message if the request to the RPC endpoint returns a 429 response', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              httpStatus: 429,
-            },
-          });
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall }) => makeRpcCall(request),
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            'Request is being rate limited',
-          );
-        });
-      });
-    } else {
-      it('throws an error with a custom message if the request to the RPC endpoint returns a 418 response', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              httpStatus: 418,
-            },
-          });
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall }) => makeRpcCall(request),
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            'Request is being rate limited.',
-          );
-        });
-      });
-
-      it('throws an undescriptive error if the request to the RPC endpoint returns a 429 response', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              httpStatus: 429,
-            },
-          });
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall }) => makeRpcCall(request),
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            "Non-200 status code: '429'",
-          );
-        });
-      });
-    }
-
-    it('throws an undescriptive error message if the request to the RPC endpoint returns a response that is not 405, 418, 429, 503, or 504', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the
-        // block-cache middleware will request the latest block number
-        // through the block tracker to determine the cache key. Later,
-        // the block-ref middleware will request the latest block number
-        // again to resolve the value of "latest", but the block number is
-        // cached once made, so we only need to mock the request once.
-        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-        // The block-ref middleware will make the request as specified
-        // except that the block param is replaced with the latest block
-        // number.
-        comms.mockRpcCall({
-          request: buildRequestWithReplacedBlockParam(
-            request,
-            blockParamIndex,
-            '0x100',
-          ),
-          response: {
-            id: 12345,
-            jsonrpc: '2.0',
-            error: 'some error',
-            httpStatus: 420,
-          },
-        });
-        const promiseForResult = withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall }) => makeRpcCall(request),
-        );
-
-        const msg =
-          providerType === 'infura'
-            ? '{"id":12345,"jsonrpc":"2.0","error":"some error"}'
-            : "Non-200 status code: '420'";
-        await expect(promiseForResult).rejects.toThrow(msg);
-      });
-    });
-
-    [503, 504].forEach((httpStatus) => {
-      it(`retries the request to the RPC endpoint up to 5 times if it returns a ${httpStatus} response, returning the successful result if there is one on the 5th try`, async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          //
-          // Here we have the request fail for the first 4 tries, then succeed
-          // on the 5th try.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              error: 'some error',
-              httpStatus,
-            },
-            times: 4,
-          });
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              result: 'the result',
-              httpStatus: 200,
-            },
-          });
-          const result = await withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          expect(result).toStrictEqual('the result');
-        });
-      });
-
-      // Both the Infura middleware and custom RPC middleware detect a 503 or 504
-      // response and retry the request to the RPC endpoint automatically but
-      // differ in what sort of response is returned when the number of retries is
-      // exhausted.
-      if (providerType === 'infura') {
-        it(`causes a request to fail with a custom error if the request to the RPC endpoint returns a ${httpStatus} response 5 times in a row`, async () => {
-          await withMockedCommunications({ providerType }, async (comms) => {
-            const request = { method };
-
-            // The first time a block-cacheable request is made, the
-            // block-cache middleware will request the latest block number
-            // through the block tracker to determine the cache key. Later,
-            // the block-ref middleware will request the latest block number
-            // again to resolve the value of "latest", but the block number is
-            // cached once made, so we only need to mock the request once.
-            comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-            // The block-ref middleware will make the request as specified
-            // except that the block param is replaced with the latest block
-            // number.
-            comms.mockRpcCall({
-              request: buildRequestWithReplacedBlockParam(
-                request,
-                blockParamIndex,
-                '0x100',
-              ),
-              response: {
-                error: 'Some error',
-                httpStatus,
-              },
-              times: 5,
-            });
-            const promiseForResult = withNetworkClient(
-              { providerType },
-              async ({ makeRpcCall, clock }) => {
-                return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                  makeRpcCall(request),
-                  clock,
-                );
-              },
-            );
-            await expect(promiseForResult).rejects.toThrow(
-              buildInfuraClientRetriesExhaustedErrorMessage('Gateway timeout'),
-            );
-          });
-        });
-      } else {
-        it(`produces an empty response if the request to the RPC endpoint returns a ${httpStatus} response 5 times in a row`, async () => {
-          await withMockedCommunications({ providerType }, async (comms) => {
-            const request = { method };
-
-            // The first time a block-cacheable request is made, the
-            // block-cache middleware will request the latest block number
-            // through the block tracker to determine the cache key. Later,
-            // the block-ref middleware will request the latest block number
-            // again to resolve the value of "latest", but the block number is
-            // cached once made, so we only need to mock the request once.
-            comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-            // The block-ref middleware will make the request as specified
-            // except that the block param is replaced with the latest block
-            // number.
-            comms.mockRpcCall({
-              request: buildRequestWithReplacedBlockParam(
-                request,
-                blockParamIndex,
-                '0x100',
-              ),
-              response: {
-                error: 'Some error',
-                httpStatus,
-              },
-              times: 5,
-            });
-            const promiseForResult = withNetworkClient(
-              { providerType },
-              async ({ makeRpcCall, clock }) => {
-                return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                  makeRpcCall(request),
-                  clock,
-                );
-              },
-            );
-            await expect(promiseForResult).rejects.toThrow(
-              buildJsonRpcEngineEmptyResponseErrorMessage(method),
-            );
-          });
-        });
-      }
-    });
-
-    it('retries the request to the RPC endpoint up to 5 times if an "ETIMEDOUT" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-      await withMockedCommunications({ providerType }, async (comms) => {
-        const request = { method };
-
-        // The first time a block-cacheable request is made, the
-        // block-cache middleware will request the latest block number
-        // through the block tracker to determine the cache key. Later,
-        // the block-ref middleware will request the latest block number
-        // again to resolve the value of "latest", but the block number is
-        // cached once made, so we only need to mock the request once.
-        comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-        // The block-ref middleware will make the request as specified
-        // except that the block param is replaced with the latest block
-        // number.
-        //
-        // Here we have the request fail for the first 4 tries, then
-        // succeed on the 5th try.
-        comms.mockRpcCall({
-          request: buildRequestWithReplacedBlockParam(
-            request,
-            blockParamIndex,
-            '0x100',
-          ),
-          error: 'ETIMEDOUT: Some message',
-          times: 4,
-        });
-        comms.mockRpcCall({
-          request: buildRequestWithReplacedBlockParam(
-            request,
-            blockParamIndex,
-            '0x100',
-          ),
-          response: {
-            result: 'the result',
-            httpStatus: 200,
-          },
-        });
-
-        const result = await withNetworkClient(
-          { providerType },
-          async ({ makeRpcCall, clock }) => {
-            return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-              makeRpcCall(request),
-              clock,
-            );
-          },
-        );
-
-        expect(result).toStrictEqual('the result');
-      });
-    });
-
-    // Both the Infura and fetch middleware detect ETIMEDOUT errors and will
-    // automatically retry the request to the RPC endpoint in question, but each
-    // produces a different error if the number of retries is exhausted.
-    if (providerType === 'infura') {
-      it('causes a request to fail with a custom error if an "ETIMEDOUT" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-          const errorMessage = 'ETIMEDOUT: Some message';
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: errorMessage,
-            times: 5,
-          });
-
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
-          );
-        });
-      });
-    } else {
-      it('produces an empty response if an "ETIMEDOUT" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-          const errorMessage = 'ETIMEDOUT: Some message';
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: errorMessage,
-            times: 5,
-          });
-
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildJsonRpcEngineEmptyResponseErrorMessage(method),
-          );
-        });
-      });
-    }
-
-    // The Infura middleware treats a response that contains an ECONNRESET
-    // message as an innocuous error that is likely to disappear on a retry. The
-    // custom RPC middleware, on the other hand, does not specially handle this
-    // error.
-    if (providerType === 'infura') {
-      it('retries the request to the RPC endpoint up to 5 times if an "ECONNRESET" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          //
-          // Here we have the request fail for the first 4 tries, then
-          // succeed on the 5th try.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: 'ECONNRESET: Some message',
-            times: 4,
-          });
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              result: 'the result',
-              httpStatus: 200,
-            },
-          });
-
-          const result = await withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          expect(result).toStrictEqual('the result');
-        });
-      });
-
-      it('causes a request to fail with a custom error if an "ECONNRESET" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-          const errorMessage = 'ECONNRESET: Some message';
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: errorMessage,
-            times: 5,
-          });
-
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
-          );
-        });
-      });
-    } else {
-      it('does not retry the request to the RPC endpoint, but throws immediately, if an "ECONNRESET" error is thrown while making the request', async () => {
-        const customRpcUrl = 'http://example.com';
-
-        await withMockedCommunications(
-          { providerType, customRpcUrl },
-          async (comms) => {
-            const request = { method };
-            const errorMessage = 'ECONNRESET: Some message';
-
-            // The first time a block-cacheable request is made, the
-            // block-cache middleware will request the latest block number
-            // through the block tracker to determine the cache key. Later,
-            // the block-ref middleware will request the latest block number
-            // again to resolve the value of "latest", but the block number is
-            // cached once made, so we only need to mock the request once.
-            comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-            // The block-ref middleware will make the request as specified
-            // except that the block param is replaced with the latest block
-            // number.
-            comms.mockRpcCall({
-              request: buildRequestWithReplacedBlockParam(
-                request,
-                blockParamIndex,
-                '0x100',
-              ),
-              error: errorMessage,
-            });
-
-            const promiseForResult = withNetworkClient(
-              { providerType, customRpcUrl },
-              async ({ makeRpcCall }) => makeRpcCall(request),
-            );
-
-            await expect(promiseForResult).rejects.toThrow(
-              buildFetchFailedErrorMessage(customRpcUrl, errorMessage),
-            );
-          },
-        );
-      });
-    }
-
-    // Both the Infura and fetch middleware will attempt to parse the response
-    // body as JSON, and if this step produces an error, both middleware will
-    // also attempt to retry the request. However, this error handling code is
-    // slightly different between the two. As the error in this case is a
-    // SyntaxError, the Infura middleware will catch it immediately, whereas the
-    // custom RPC middleware will catch it and re-throw a separate error, which
-    // it then catches later.
-    if (providerType === 'infura') {
-      it('retries the request to the RPC endpoint up to 5 times if a "SyntaxError" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          //
-          // Here we have the request fail for the first 4 tries, then
-          // succeed on the 5th try.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: 'SyntaxError: Some message',
-            times: 4,
-          });
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              result: 'the result',
-              httpStatus: 200,
-            },
-          });
-          const result = await withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          expect(result).toStrictEqual('the result');
-        });
-      });
-
-      it('causes a request to fail with a custom error if a "SyntaxError" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-          const errorMessage = 'SyntaxError: Some message';
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: errorMessage,
-            times: 5,
-          });
-
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildInfuraClientRetriesExhaustedErrorMessage(errorMessage),
-          );
-        });
-      });
-
-      it('does not retry the request to the RPC endpoint, but throws immediately, if a "failed to parse response body" error is thrown while making the request', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-          const errorMessage = 'failed to parse response body: Some message';
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: errorMessage,
-          });
-
-          const promiseForResult = withNetworkClient(
-            { providerType, infuraNetwork: comms.infuraNetwork },
-            async ({ makeRpcCall }) => makeRpcCall(request),
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildFetchFailedErrorMessage(comms.rpcUrl, errorMessage),
-          );
-        });
-      });
-    } else {
-      it('does not retry the request to the RPC endpoint, but throws immediately, if a "SyntaxError" error is thrown while making the request', async () => {
-        const customRpcUrl = 'http://example.com';
-
-        await withMockedCommunications(
-          { providerType, customRpcUrl },
-          async (comms) => {
-            const request = { method };
-            const errorMessage = 'SyntaxError: Some message';
-
-            // The first time a block-cacheable request is made, the
-            // block-cache middleware will request the latest block number
-            // through the block tracker to determine the cache key. Later,
-            // the block-ref middleware will request the latest block number
-            // again to resolve the value of "latest", but the block number is
-            // cached once made, so we only need to mock the request once.
-            comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-            // The block-ref middleware will make the request as specified
-            // except that the block param is replaced with the latest block
-            // number.
-            comms.mockRpcCall({
-              request: buildRequestWithReplacedBlockParam(
-                request,
-                blockParamIndex,
-                '0x100',
-              ),
-              error: errorMessage,
-            });
-
-            const promiseForResult = withNetworkClient(
-              { providerType, customRpcUrl },
-              async ({ makeRpcCall }) => makeRpcCall(request),
-            );
-
-            await expect(promiseForResult).rejects.toThrow(
-              buildFetchFailedErrorMessage(customRpcUrl, errorMessage),
-            );
-          },
-        );
-      });
-
-      it('retries the request to the RPC endpoint up to 5 times if a "failed to parse response body" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          //
-          // Here we have the request fail for the first 4 tries, then
-          // succeed on the 5th try.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: 'failed to parse response body: Some message',
-            times: 4,
-          });
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              result: 'the result',
-              httpStatus: 200,
-            },
-          });
-
-          const result = await withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          expect(result).toStrictEqual('the result');
-        });
-      });
-
-      it('produces an empty response if a "failed to parse response body" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-          const errorMessage = 'failed to parse response body: some message';
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: errorMessage,
-            times: 5,
-          });
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildJsonRpcEngineEmptyResponseErrorMessage(method),
-          );
-        });
-      });
-    }
-
-    // Only the custom RPC middleware will detect a "Failed to fetch" error and
-    // attempt to retry the request to the RPC endpoint; the Infura middleware
-    // does not.
-    if (providerType === 'infura') {
-      it('does not retry the request to the RPC endpoint, but throws immediately, if a "Failed to fetch" error is thrown while making the request', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-          const errorMessage = 'Failed to fetch: Some message';
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: errorMessage,
-          });
-
-          const promiseForResult = withNetworkClient(
-            { providerType, infuraNetwork: comms.infuraNetwork },
-            async ({ makeRpcCall }) => makeRpcCall(request),
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildFetchFailedErrorMessage(comms.rpcUrl, errorMessage),
-          );
-        });
-      });
-    } else {
-      it('retries the request to the RPC endpoint up to 5 times if a "Failed to fetch" error is thrown while making the request, returning the successful result if there is one on the 5th try', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          //
-          // Here we have the request fail for the first 4 tries, then
-          // succeed on the 5th try.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: 'Failed to fetch: Some message',
-            times: 4,
-          });
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            response: {
-              result: 'the result',
-              httpStatus: 200,
-            },
-          });
-
-          const result = await withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          expect(result).toStrictEqual('the result');
-        });
-      });
-
-      it('produces an empty response if a "Failed to fetch" error is thrown while making the request to the RPC endpoint 5 times in a row', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const request = { method };
-          const errorMessage = 'Failed to fetch: some message';
-
-          // The first time a block-cacheable request is made, the
-          // block-cache middleware will request the latest block number
-          // through the block tracker to determine the cache key. Later,
-          // the block-ref middleware will request the latest block number
-          // again to resolve the value of "latest", but the block number is
-          // cached once made, so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: buildRequestWithReplacedBlockParam(
-              request,
-              blockParamIndex,
-              '0x100',
-            ),
-            error: errorMessage,
-            times: 5,
-          });
-          const promiseForResult = withNetworkClient(
-            { providerType },
-            async ({ makeRpcCall, clock }) => {
-              return await waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                makeRpcCall(request),
-                clock,
-              );
-            },
-          );
-
-          await expect(promiseForResult).rejects.toThrow(
-            buildJsonRpcEngineEmptyResponseErrorMessage(method),
-          );
-        });
-      });
-    }
-  });
-
-  describe.each([
-    ['given a block tag of "earliest"', 'earliest', 'earliest'],
-    ['given a block number', 'block number', '0x100'],
-  ])('%s', (_desc, blockParamType, blockParam) => {
-    it('does not hit the RPC endpoint more than once for identical requests', async () => {
-      const requests = [
-        {
-          method,
-          params: buildMockParams({ blockParamIndex, blockParam }),
-        },
-        {
-          method,
-          params: buildMockParams({ blockParamIndex, blockParam }),
-        },
-      ];
-      const mockResults = ['first result', 'second result'];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the block-cache
-        // middleware will request the latest block number through the block
-        // tracker to determine the cache key. This block number doesn't
-        // matter.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request: requests[0],
-          response: { result: mockResults[0] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-        );
-
-        expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
-      });
-    });
-
-    for (const paramIndex of [...Array(numberOfParameters).keys()]) {
-      if (paramIndex === blockParamIndex) {
-        // testing changes in block param is covered under later tests
-        continue;
-      }
-      it(`does not reuse the result of a previous request if parameter at index "${paramIndex}" differs`, async () => {
-        const firstMockParams = [
-          ...new Array(numberOfParameters).fill('some value'),
-        ];
-        firstMockParams[blockParamIndex] = blockParam;
-        const secondMockParams = firstMockParams.slice();
-        secondMockParams[paramIndex] = 'another value';
-        const requests = [
-          {
-            method,
-            params: firstMockParams,
-          },
-          { method, params: secondMockParams },
-        ];
-        const mockResults = ['first result', 'second result'];
-
-        await withMockedCommunications({ providerType }, async (comms) => {
-          // The first time a block-cacheable request is made, the block-cache
-          // middleware will request the latest block number through the block
-          // tracker to determine the cache key. Later, the block-ref
-          // middleware will request the latest block number again to resolve
-          // the value of "latest", but the block number is cached once made,
-          // so we only need to mock the request once.
-          comms.mockNextBlockTrackerRequest({ blockNumber: '0x100' });
-          // The block-ref middleware will make the request as specified
-          // except that the block param is replaced with the latest block
-          // number.
-          comms.mockRpcCall({
-            request: requests[0],
-            response: { result: mockResults[0] },
-          });
-          comms.mockRpcCall({
-            request: requests[1],
-            response: { result: mockResults[1] },
-          });
-
-          const results = await withNetworkClient(
-            { providerType },
-            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-          );
-
-          expect(results).toStrictEqual([mockResults[0], mockResults[1]]);
-        });
-      });
-    }
-
-    it('reuses the result of a previous request even if the latest block number was updated since', async () => {
-      const requests = [
-        {
-          method,
-          params: buildMockParams({ blockParamIndex, blockParam }),
-        },
-        {
-          method,
-          params: buildMockParams({ blockParamIndex, blockParam }),
-        },
-      ];
-      const mockResults = ['first result', 'second result'];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // Note that we have to mock these requests in a specific order. The
-        // first block tracker request occurs because of the first RPC
-        // request. The second block tracker request, however, does not
-        // occur because of the second RPC request, but rather because we
-        // call `clock.runAll()` below.
-        comms.mockNextBlockTrackerRequest({ blockNumber: '0x1' });
-        comms.mockRpcCall({
-          request: requests[0],
-          response: { result: mockResults[0] },
-        });
-        comms.mockNextBlockTrackerRequest({ blockNumber: '0x2' });
-        comms.mockRpcCall({
-          request: requests[1],
-          response: { result: mockResults[1] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          async (client) => {
-            const firstResult = await client.makeRpcCall(requests[0]);
-            // Proceed to the next iteration of the block tracker so that a
-            // new block is fetched and the current block is updated.
-            client.clock.runAll();
-            const secondResult = await client.makeRpcCall(requests[1]);
-            return [firstResult, secondResult];
-          },
-        );
-
-        expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
-      });
-    });
-
-    if (blockParamType === 'earliest') {
-      it('treats "0x00" as a synonym for "earliest"', async () => {
-        const requests = [
-          {
-            method,
-            params: buildMockParams({ blockParamIndex, blockParam }),
-          },
-          {
-            method,
-            params: buildMockParams({ blockParamIndex, blockParam: '0x00' }),
-          },
-        ];
-        const mockResults = ['first result', 'second result'];
-
-        await withMockedCommunications({ providerType }, async (comms) => {
-          // The first time a block-cacheable request is made, the latest
-          // block number is retrieved through the block tracker first. It
-          // doesn't matter what this is — it's just used as a cache key.
-          comms.mockNextBlockTrackerRequest();
-          comms.mockRpcCall({
-            request: requests[0],
-            response: { result: mockResults[0] },
-          });
-
-          const results = await withNetworkClient(
-            { providerType },
-            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-          );
-
-          expect(results).toStrictEqual([mockResults[0], mockResults[0]]);
-        });
-      });
-
-      for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
-        it(`does not retry an empty response of "${emptyValue}"`, async () => {
-          const request = {
-            method,
-            params: buildMockParams({ blockParamIndex, blockParam }),
-          };
-          const mockResult = emptyValue;
-
-          await withMockedCommunications({ providerType }, async (comms) => {
-            // The first time a block-cacheable request is made, the latest block
-            // number is retrieved through the block tracker first. It doesn't
-            // matter what this is — it's just used as a cache key.
-            comms.mockNextBlockTrackerRequest();
-            comms.mockRpcCall({
-              request,
-              response: { result: mockResult },
-            });
-
-            const result = await withNetworkClient(
-              { providerType },
-              ({ makeRpcCall }) => makeRpcCall(request),
-            );
-
-            expect(result).toStrictEqual(mockResult);
-          });
-        });
-
-        it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
-          const requests = [
-            {
-              method,
-              params: buildMockParams({ blockParamIndex, blockParam }),
-            },
-            {
-              method,
-              params: buildMockParams({ blockParamIndex, blockParam }),
-            },
-          ];
-          const mockResults = [emptyValue, 'some result'];
-
-          await withMockedCommunications({ providerType }, async (comms) => {
-            // The first time a block-cacheable request is made, the latest block
-            // number is retrieved through the block tracker first. It doesn't
-            // matter what this is — it's just used as a cache key.
-            comms.mockNextBlockTrackerRequest();
-            comms.mockRpcCall({
-              request: requests[0],
-              response: { result: mockResults[0] },
-            });
-            comms.mockRpcCall({
-              request: requests[1],
-              response: { result: mockResults[1] },
-            });
-
-            const results = await withNetworkClient(
-              { providerType },
-              ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-            );
-
-            expect(results).toStrictEqual(mockResults);
-          });
-        });
-      }
-    }
-
-    if (blockParamType === 'block number') {
-      it('does not reuse the result of a previous request if it was made with different arguments than this one', async () => {
-        await withMockedCommunications({ providerType }, async (comms) => {
-          const requests = [
-            {
-              method,
-              params: buildMockParams({ blockParamIndex, blockParam: '0x100' }),
-            },
-            {
-              method,
-              params: buildMockParams({ blockParamIndex, blockParam: '0x200' }),
-            },
-          ];
-
-          // The first time a block-cacheable request is made, the latest block
-          // number is retrieved through the block tracker first. It doesn't
-          // matter what this is — it's just used as a cache key.
-          comms.mockNextBlockTrackerRequest();
-          comms.mockRpcCall({
-            request: requests[0],
-            response: { result: 'first result' },
-          });
-          comms.mockRpcCall({
-            request: requests[1],
-            response: { result: 'second result' },
-          });
-
-          const results = await withNetworkClient(
-            { providerType },
-            ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-          );
-
-          expect(results).toStrictEqual(['first result', 'second result']);
-        });
-      });
-
-      describe.each(
-        [
-          ['less than the current block number', '0x200'],
-          ['equal to the curent block number', '0x100'],
-        ],
-        '%s',
-        (_nestedDesc, currentBlockNumber) => {
-          it('makes an additional request to the RPC endpoint', async () => {
-            await withMockedCommunications({ providerType }, async (comms) => {
-              const request = {
-                method,
-                // Note that `blockParam` is `0x100` here
-                params: buildMockParams({ blockParamIndex, blockParam }),
-              };
-
-              // The first time a block-cacheable request is made, the latest
-              // block number is retrieved through the block tracker first.
-              comms.mockNextBlockTrackerRequest({
-                blockNumber: currentBlockNumber,
-              });
-              comms.mockRpcCall({
-                request,
-                response: { result: 'the result' },
-              });
-
-              const result = await withNetworkClient(
-                { providerType },
-                ({ makeRpcCall }) => makeRpcCall(request),
-              );
-
-              expect(result).toStrictEqual('the result');
-            });
-          });
-
-          for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
-            if (providerType === 'infura') {
-              it(`retries up to 10 times if a "${emptyValue}" response is returned, returning successful non-empty response if there is one on the 10th try`, async () => {
-                const request = {
-                  method,
-                  // Note that `blockParam` is `0x100` here
-                  params: buildMockParams({ blockParamIndex, blockParam }),
-                };
-
-                await withMockedCommunications(
-                  { providerType },
-                  async (comms) => {
-                    // The first time a block-cacheable request is made, the latest block
-                    // number is retrieved through the block tracker first.
-                    comms.mockNextBlockTrackerRequest({
-                      blockNumber: currentBlockNumber,
-                    });
-                    comms.mockRpcCall({
-                      request,
-                      response: { result: emptyValue },
-                      times: 9,
-                    });
-                    comms.mockRpcCall({
-                      request,
-                      response: { result: 'some value' },
-                    });
-
-                    const result = await withNetworkClient(
-                      { providerType },
-                      ({ makeRpcCall, clock }) =>
-                        waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                          makeRpcCall(request),
-                          clock,
-                        ),
-                    );
-
-                    expect(result).toStrictEqual('some value');
-                  },
-                );
-              });
-
-              it(`retries up to 10 times if a "${emptyValue}" response is returned, failing after the 10th try`, async () => {
-                const request = {
-                  method,
-                  // Note that `blockParam` is `0x100` here
-                  params: buildMockParams({ blockParamIndex, blockParam }),
-                };
-                const mockResult = emptyValue;
-
-                await withMockedCommunications(
-                  { providerType },
-                  async (comms) => {
-                    // The first time a block-cacheable request is made, the latest block
-                    // number is retrieved through the block tracker first.
-                    comms.mockNextBlockTrackerRequest({
-                      blockNumber: currentBlockNumber,
-                    });
-                    comms.mockRpcCall({
-                      request,
-                      response: { result: mockResult },
-                      times: 10,
-                    });
-
-                    const promiseForResult = withNetworkClient(
-                      { providerType },
-                      ({ makeRpcCall, clock }) =>
-                        waitForPromiseToBeFulfilledAfterRunningAllTimers(
-                          makeRpcCall(request),
-                          clock,
-                        ),
-                    );
-
-                    await expect(promiseForResult).rejects.toThrow(
-                      'RetryOnEmptyMiddleware - retries exhausted',
-                    );
-                  },
-                );
-              });
-            } else {
-              it(`does not retry an empty response of "${emptyValue}"`, async () => {
-                const request = {
-                  method,
-                  // Note that `blockParam` is `0x100` here
-                  params: buildMockParams({ blockParamIndex, blockParam }),
-                };
-                const mockResult = emptyValue;
-
-                await withMockedCommunications(
-                  { providerType },
-                  async (comms) => {
-                    // The first time a block-cacheable request is made, the latest block
-                    // number is retrieved through the block tracker first.
-                    comms.mockNextBlockTrackerRequest({
-                      blockNumber: currentBlockNumber,
-                    });
-                    comms.mockRpcCall({
-                      request: buildRequestWithReplacedBlockParam(
-                        request,
-                        blockParamIndex,
-                        '0x100',
-                      ),
-                      response: { result: mockResult },
-                    });
-
-                    const result = await withNetworkClient(
-                      { providerType },
-                      ({ makeRpcCall }) => makeRpcCall(request),
-                    );
-
-                    expect(result).toStrictEqual(mockResult);
-                  },
-                );
-              });
-
-              it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
-                const requests = [
-                  {
-                    method,
-                    // Note that `blockParam` is `0x100` here
-                    params: buildMockParams({ blockParamIndex, blockParam }),
-                  },
-                  {
-                    method,
-                    // Note that `blockParam` is `0x100` here
-                    params: buildMockParams({ blockParamIndex, blockParam }),
-                  },
-                ];
-                const mockResults = [emptyValue, { blockHash: '0x100' }];
-
-                await withMockedCommunications(
-                  { providerType },
-                  async (comms) => {
-                    // The first time a block-cacheable request is made, the latest block
-                    // number is retrieved through the block tracker first.
-                    comms.mockNextBlockTrackerRequest({
-                      blockNumber: currentBlockNumber,
-                    });
-                    comms.mockRpcCall({
-                      request: buildRequestWithReplacedBlockParam(
-                        requests[0],
-                        blockParamIndex,
-                        '0x100',
-                      ),
-                      response: { result: mockResults[0] },
-                    });
-                    comms.mockRpcCall({
-                      request: buildRequestWithReplacedBlockParam(
-                        requests[1],
-                        blockParamIndex,
-                        '0x100',
-                      ),
-                      response: { result: mockResults[1] },
-                    });
-
-                    const results = await withNetworkClient(
-                      { providerType },
-                      ({ makeRpcCallsInSeries }) =>
-                        makeRpcCallsInSeries(requests),
-                    );
-
-                    expect(results).toStrictEqual(mockResults);
-                  },
-                );
-              });
-            }
-          }
-        },
-      );
-
-      describe('greater than the current block number', () => {
-        it('makes an additional request to the RPC endpoint', async () => {
-          await withMockedCommunications({ providerType }, async (comms) => {
-            const request = {
-              method,
-              // Note that `blockParam` is `0x100` here
-              params: buildMockParams({ blockParamIndex, blockParam }),
-            };
-
-            // The first time a block-cacheable request is made, the latest
-            // block number is retrieved through the block tracker first.
-            comms.mockNextBlockTrackerRequest({ blockNumber: '0x42' });
-            comms.mockRpcCall({
-              request,
-              response: { result: 'the result' },
-            });
-
-            const result = await withNetworkClient(
-              { providerType },
-              ({ makeRpcCall }) => makeRpcCall(request),
-            );
-
-            expect(result).toStrictEqual('the result');
-          });
-        });
-
-        for (const emptyValue of [null, undefined, '\u003cnil\u003e']) {
-          it(`does not retry an empty response of "${emptyValue}"`, async () => {
-            const request = {
-              method,
-              // Note that `blockParam` is `0x100` here
-              params: buildMockParams({ blockParamIndex, blockParam }),
-            };
-            const mockResult = emptyValue;
-
-            await withMockedCommunications({ providerType }, async (comms) => {
-              // The first time a block-cacheable request is made, the latest block
-              // number is retrieved through the block tracker first.
-              comms.mockNextBlockTrackerRequest({ blockNumber: '0x42' });
-              comms.mockRpcCall({
-                request: buildRequestWithReplacedBlockParam(
-                  request,
-                  blockParamIndex,
-                  '0x100',
-                ),
-                response: { result: mockResult },
-              });
-
-              const result = await withNetworkClient(
-                { providerType },
-                ({ makeRpcCall }) => makeRpcCall(request),
-              );
-
-              expect(result).toStrictEqual(mockResult);
-            });
-          });
-
-          it(`does not reuse the result of a previous request if it was "${emptyValue}"`, async () => {
-            const requests = [
-              {
-                method,
-                // Note that `blockParam` is `0x100` here
-                params: buildMockParams({ blockParamIndex, blockParam }),
-              },
-              {
-                method,
-                // Note that `blockParam` is `0x100` here
-                params: buildMockParams({ blockParamIndex, blockParam }),
-              },
-            ];
-            const mockResults = [emptyValue, { blockHash: '0x100' }];
-
-            await withMockedCommunications({ providerType }, async (comms) => {
-              // The first time a block-cacheable request is made, the latest block
-              // number is retrieved through the block tracker first.
-              comms.mockNextBlockTrackerRequest({ blockNumber: '0x42' });
-              comms.mockRpcCall({
-                request: buildRequestWithReplacedBlockParam(
-                  requests[0],
-                  blockParamIndex,
-                  '0x100',
-                ),
-                response: { result: mockResults[0] },
-              });
-              comms.mockRpcCall({
-                request: buildRequestWithReplacedBlockParam(
-                  requests[1],
-                  blockParamIndex,
-                  '0x100',
-                ),
-                response: { result: mockResults[1] },
-              });
-
-              const results = await withNetworkClient(
-                { providerType },
-                ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-              );
-
-              expect(results).toStrictEqual(mockResults);
-            });
-          });
-        }
-      });
-    }
-  });
-
-  describe('given a block tag of "pending"', () => {
-    const params = buildMockParams({ blockParamIndex, blockParam: 'pending' });
-
-    it('hits the RPC endpoint on all calls and does not cache anything', async () => {
-      const requests = [
-        { method, params },
-        { method, params },
-      ];
-      const mockResults = ['first result', 'second result'];
-
-      await withMockedCommunications({ providerType }, async (comms) => {
-        // The first time a block-cacheable request is made, the latest
-        // block number is retrieved through the block tracker first. It
-        // doesn't matter what this is — it's just used as a cache key.
-        comms.mockNextBlockTrackerRequest();
-        comms.mockRpcCall({
-          request: requests[0],
-          response: { result: mockResults[0] },
-        });
-        comms.mockRpcCall({
-          request: requests[1],
-          response: { result: mockResults[1] },
-        });
-
-        const results = await withNetworkClient(
-          { providerType },
-          ({ makeRpcCallsInSeries }) => makeRpcCallsInSeries(requests),
-        );
-
-        expect(results).toStrictEqual(mockResults);
-      });
-    });
-  });
-}

From 1d5e8a78400d7aaaf2b3cbdb30cff9399061df34 Mon Sep 17 00:00:00 2001
From: Vladimir Saric <92527393+VSaric@users.noreply.github.com>
Date: Mon, 20 Mar 2023 18:05:48 +0100
Subject: [PATCH 032/129] Added fallback copy for when we're not able to
 retrieve a erc721 or erc1155 name in the setApprovalForAll screen (#17992)

* Added fallback copy for when we're not able to retrieve a erc721 or erc1155 name in the setApprovalForAll screen and added unit tests

* Fixing lint

* Review requested changes

* Modify small copy changes in messages.json

* Fixing nft e2e tests

* Fixing nft e2e tests final

* Added snapshots for tests and removed data-testid

* Modify translation messages and e2e tests
---
 app/_locales/de/messages.json                 |   3 -
 app/_locales/el/messages.json                 |   3 -
 app/_locales/en/messages.json                 |  26 +-
 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/nft/erc1155-interaction.spec.js      |   8 +-
 ...irm-approve-content.component.test.js.snap | 738 ++++++++++++++++++
 .../confirm-approve-content.component.js      |  49 +-
 .../confirm-approve-content.component.test.js |  44 ++
 19 files changed, 846 insertions(+), 61 deletions(-)
 create mode 100644 ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index f5e257ef6..3923e2b5e 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Nonce ist höher als vorgeschlagen nonce von $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "NFT kann nicht hinzugefügt werden, da die Eigentumsangaben nicht übereinstimmen. Stellen Sie sicher, dass Sie die richtigen Informationen eingegeben haben."
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index f2ab8a5e0..19f736c5f 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Το Nonce είναι υψηλότερο από το προτεινόμενο nonce του $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "Τα NFT δεν μπορούν να προστεθούν, διότι τα στοιχεία της κυριότητας δεν ταυτίζονται. Σιγουρευτείτε ότι έχετε εισαγάγει τα σωστά στοιχεία."
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index eefe50cb5..7b45679ff 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -321,6 +321,10 @@
     "message": "All of your $1",
     "description": "$1 is the symbol or name of the token that the user is approving spending"
   },
+  "allYourNFTsOf": {
+    "message": "All of your NFTs from $1",
+    "description": "$1 is a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
   "allowExternalExtensionTo": {
     "message": "Allow this external extension to:"
   },
@@ -368,6 +372,10 @@
     "message": "Allow access to and transfer of all your $1?",
     "description": "$1 is the symbol of the token for which the user is granting approval"
   },
+  "approveAllTokensTitleWithoutSymbol": {
+    "message": "Allow access to and transfer all of your NFTs from $1?",
+    "description": "$1 a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
   "approveAndInstall": {
     "message": "Approve & install"
   },
@@ -384,6 +392,10 @@
   "approveTokenDescription": {
     "message": "This allows a third party to access and transfer the following NFTs without further notice until you revoke its access."
   },
+  "approveTokenDescriptionWithoutSymbol": {
+    "message": "This allows a third party to access and transfer all of your NFTs from $1 without further notice until you revoke its access.",
+    "description": "$1 is a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
   "approveTokenTitle": {
     "message": "Allow access to and transfer of your $1?",
     "description": "$1 is the symbol of the token for which the user is granting approval"
@@ -2224,9 +2236,6 @@
     "message": "Nonce is higher than suggested nonce of $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "NFT can’t be added as the ownership details do not match. Make sure you have entered correct information."
   },
@@ -3212,10 +3221,18 @@
     "message": "Revoke permission to access and transfer all of your $1?",
     "description": "$1 is the symbol of the token for which the user is revoking approval"
   },
+  "revokeAllTokensTitleWithoutSymbol": {
+    "message": "Revoke permission to access and transfer all of your NFTs from $1?",
+    "description": "$1 is a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
   "revokeApproveForAllDescription": {
     "message": "This revokes the permission for a third party to access and transfer all of your $1 without further notice.",
     "description": "$1 is either a string or link of a given token symbol or name"
   },
+  "revokeApproveForAllDescriptionWithoutSymbol": {
+    "message": "This revokes the permission for a third party to access and transfer all of your NFTs from $1 without further notice.",
+    "description": "$1 is a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
   "revokeSpendingCap": {
     "message": "Revoke spending cap for your $1",
     "description": "$1 is a token symbol"
@@ -4196,6 +4213,9 @@
   "thingsToKeep": {
     "message": "Things to keep in mind:"
   },
+  "thisCollection": {
+    "message": "this collection"
+  },
   "thisIsBasedOn": {
     "message": "This is based on information from "
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index ad1319017..94b2d78da 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -2191,9 +2191,6 @@
     "message": "El nonce es superior al nonce sugerido de $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "No se puede agregar el NFT porque los detalles de propiedad no coinciden. Asegúrese de haber ingresado la información correcta."
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 78408e2db..34849859e 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Le nonce est supérieur au nonce suggéré de $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "Ce NFT ne peut pas être ajouté, car les informations de propriété ne correspondent pas. Vérifiez que votre saisie est correcte."
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 61eafe59d..b57d88ae8 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -2191,9 +2191,6 @@
     "message": "नॉन्स $1 के सुझाए गए नॉन्स से अधिक है",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "एनएफटी"
-  },
   "nftAddFailedMessage": {
     "message": "एनएफटी जोड़ा नहीं जा सकता क्योंकि स्वामित्व विवरण मेल नहीं खा रहे हैं। सुनिश्चित करें कि आपने सही जानकारी दर्ज की है।"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 76dd89d9b..a5c4bd5e2 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Nonce lebih tinggi dari nonce $1 yang disarankan",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "NFT tidak dapat ditambahkan karena detail kepemilikan tidak cocok. Pastikan Anda telah memasukkan informasi yang benar."
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index eb13dbc01..04461f0f6 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -2191,9 +2191,6 @@
     "message": "ナンスが提案され$1よりも大きいです",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "所有者情報が一致していないため、NFT を追加できません。入力された情報が正しいことを確認してください。"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 7b24d0458..b321862ab 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -2191,9 +2191,6 @@
     "message": "임시값이 권장 임시값인 $1보다 큽니다.",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT\n"
-  },
   "nftAddFailedMessage": {
     "message": "소유권 정보가 일치하지 않아 NFT를 추가할 수 없습니다. 올바른 정보를 입력했는지 확인하세요."
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index ae39ab7d9..86f69b1c0 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Nonce é maior que o nonce sugerido de $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "O NFT não pôde ser adicionado, pois os dados de propriedade não coincidem. Certifique-se de ter inserido as informações corretas."
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index f4edcbfc1..dd8db16a5 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Одноразовый номер больше, чем предложенный одноразовый номер $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "Невозможно добавить NFT, так как сведения о владельце не совпадают. Убедитесь, что вы ввели правильную информацию."
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 461e9f291..d7e0c937d 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Mas mataas ang noncesa iminumungkahing nonce na $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "Hindi maidaragdag ang NFT dahil hindi tumutugma ang mga detalye ng pagmamay-ari. Siguraduhing tamang impormasyon ang iyong nailagay."
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 8472fce54..5887a63d5 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Geçici anahtar, önerilen $1 geçici anahtarından daha büyük",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "Sahiplik bilgileri eşleşmediği için NFT eklenemiyor. Doğru bilgileri girdiğinizden emin olun."
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 892ad6942..9a19d71b3 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Số chỉ dùng một lần lớn hơn số chỉ dùng một lần gợi ý là $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftAddFailedMessage": {
     "message": "Không thể thêm NFT vì thông tin quyền sở hữu không trùng khớp. Đảm bảo bạn đã nhập đúng thông tin."
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 9fec36276..49b04ecd2 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -2191,9 +2191,6 @@
     "message": "Nonce 高于建议的 nouce 值 $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "非同质化代币(NFT)"
-  },
   "nftAddFailedMessage": {
     "message": "由于所有权信息不匹配，无法添加NFT。请确保所输入的信息正确无误。"
   },
diff --git a/test/e2e/nft/erc1155-interaction.spec.js b/test/e2e/nft/erc1155-interaction.spec.js
index 5dcc75203..7a5b95961 100644
--- a/test/e2e/nft/erc1155-interaction.spec.js
+++ b/test/e2e/nft/erc1155-interaction.spec.js
@@ -129,9 +129,9 @@ describe('ERC1155 NFTs testdapp interaction', function () {
 
   it('should enable approval for a third party address to manage all ERC1155 token', async function () {
     const expectedMessageTitle =
-      'Allow access to and transfer of all your NFT?';
+      'Allow access to and transfer all of your NFTs from this collection?';
     const expectedDescription =
-      'This allows a third party to access and transfer the following NFTs without further notice until you revoke its access.';
+      'This allows a third party to access and transfer all of your NFTs from this collection without further notice until you revoke its access.';
     const expectedWarningMessage = 'Your NFT may be at risk';
     await withFixtures(
       {
@@ -219,9 +219,9 @@ describe('ERC1155 NFTs testdapp interaction', function () {
 
   it('should revoke approval for a third party address to manage all ERC1155 token', async function () {
     const expectedMessageTitle =
-      'Revoke permission to access and transfer all of your NFT?';
+      'Revoke permission to access and transfer all of your NFTs from this collection?';
     const expectedDescription =
-      'This revokes the permission for a third party to access and transfer all of your NFT without further notice.';
+      'This revokes the permission for a third party to access and transfer all of your NFTs from this collection without further notice.';
     await withFixtures(
       {
         dapp: true,
diff --git a/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap b/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap
new file mode 100644
index 000000000..a2c7be080
--- /dev/null
+++ b/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap
@@ -0,0 +1,738 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConfirmApproveContent Component should render Confirm approve page correctly and display fallback copy for when we are able to retrieve a erc721 or erc1155 name in the setApprovalForAll screen and when giving a setApprovalForAll allowance 1`] = `
+<div>
+  <div
+    class="confirm-approve-content"
+  >
+    <div
+      class="box confirm-approve-content__icon-display-content box--display-flex box--flex-direction-row"
+    >
+      <div
+        class="box box--display-flex box--flex-direction-row box--align-items-center"
+      >
+        <div
+          class=""
+        >
+          <img
+            alt="https://metamask.github.io/test-dapp/"
+            class="url-icon confirm-approve-content__siteimage-identicon"
+            src="https://metamask.github.io/test-dapp/metamask-fox.svg"
+          />
+        </div>
+        <h6
+          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--margin-left-1 box--flex-direction-row"
+        >
+          https://metamask.github.io/test-dapp/
+        </h6>
+      </div>
+    </div>
+    <div
+      class="confirm-approve-content__title"
+      data-testid="confirm-approve-title"
+    >
+      <span>
+         
+        Allow access to and transfer of all your 
+        <span
+          class="confirm-approve-content__approval-asset-title"
+        >
+          ZenAcademy
+        </span>
+        
+        ?
+         
+      </span>
+    </div>
+    <div
+      class="confirm-approve-content__description"
+    >
+      This allows a third party to access and transfer the following NFTs without further notice until you revoke its access.
+    </div>
+    <div
+      class="box box--margin-top-2 box--margin-bottom-4 box--flex-direction-row"
+    >
+      <a
+        class="button btn-link confirm-approve-content__verify-contract-details"
+        role="button"
+        tabindex="0"
+      >
+        Verify contract details
+      </a>
+    </div>
+    <div
+      class="confirm-approve-content__card-wrapper"
+    >
+      <div
+        class="confirm-approve-content__card--no-border"
+      >
+        <div
+          class="confirm-approve-content__card-header"
+        >
+          <div
+            class="confirm-approve-content__card-header__symbol"
+          >
+            <span
+              class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-inherit"
+              style="mask-image: url('./images/icons/tag.svg');"
+            />
+          </div>
+          <div
+            class="confirm-approve-content__card-header__title"
+          >
+            Transaction fee
+          </div>
+          <div
+            class="box box--flex-direction-row box--width-1/6"
+          >
+            <a
+              class="button btn-link confirm-approve-content__small-blue-text"
+              role="button"
+              tabindex="0"
+            >
+              Edit
+            </a>
+          </div>
+        </div>
+        <div
+          class="confirm-approve-content__card-content"
+        >
+          <div
+            class="confirm-approve-content__transaction-details-content"
+          >
+            <div
+              class="confirm-approve-content__small-text"
+            >
+              A fee is associated with this request.
+            </div>
+            <div
+              class="confirm-approve-content__transaction-details-content__fee"
+            >
+              <div
+                class="confirm-approve-content__transaction-details-content__primary-fee"
+              >
+                $10.00
+              </div>
+              <div
+                class="confirm-approve-content__transaction-details-content__secondary-fee"
+              >
+                20 ETH
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="confirm-approve-content__card--no-border"
+      >
+        <div
+          class="confirm-approve-content__card-content"
+        >
+          <div
+            class="confirm-approve-content__custom-nonce-content"
+          >
+            <div
+              class="box confirm-approve-content__custom-nonce-header box--flex-direction-row box--justify-content-flex-start box--display-flex"
+            >
+              <h6
+                class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+              >
+                Nonce
+              </h6>
+              <a
+                class="button btn-link confirm-approve-content__custom-nonce-edit"
+                role="button"
+                tabindex="0"
+              >
+                Edit
+              </a>
+            </div>
+            <h6
+              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold mm-text--color-text-default box--flex-direction-row"
+            >
+              2
+            </h6>
+          </div>
+        </div>
+        <div
+          class="confirm-approve-content__view-full-tx-button-wrapper"
+        >
+          <div
+            class="confirm-approve-content__view-full-tx-button cursor-pointer"
+          >
+            <div
+              class="confirm-approve-content__small-blue-text"
+            >
+              View full transaction details
+            </div>
+            <i
+              class="fa fa-caret-down"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`ConfirmApproveContent Component should render Confirm approve page correctly and display fallback copy for when we are able to retrieve a erc721 or erc1155 name in the setApprovalForAll screen and when revoking a setApprovalForAll allowance 1`] = `
+<div>
+  <div
+    class="confirm-approve-content"
+  >
+    <div
+      class="box confirm-approve-content__icon-display-content box--display-flex box--flex-direction-row"
+    >
+      <div
+        class="box box--display-flex box--flex-direction-row box--align-items-center"
+      >
+        <div
+          class=""
+        >
+          <img
+            alt="https://metamask.github.io/test-dapp/"
+            class="url-icon confirm-approve-content__siteimage-identicon"
+            src="https://metamask.github.io/test-dapp/metamask-fox.svg"
+          />
+        </div>
+        <h6
+          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--margin-left-1 box--flex-direction-row"
+        >
+          https://metamask.github.io/test-dapp/
+        </h6>
+      </div>
+    </div>
+    <div
+      class="confirm-approve-content__title"
+      data-testid="confirm-approve-title"
+    >
+      <span>
+         
+        Revoke permission to access and transfer all of your 
+        <span
+          class="confirm-approve-content__approval-asset-title"
+        >
+          ZenAcademy
+        </span>
+        
+        ?
+         
+      </span>
+    </div>
+    <div
+      class="confirm-approve-content__description"
+    >
+      <span>
+         
+        This revokes the permission for a third party to access and transfer all of your 
+        <span
+          class="confirm-approve-content__approval-asset-title"
+        >
+          ZenAcademy
+        </span>
+        
+         without further notice.
+         
+      </span>
+    </div>
+    <div
+      class="box box--margin-top-2 box--margin-bottom-4 box--flex-direction-row"
+    >
+      <a
+        class="button btn-link confirm-approve-content__verify-contract-details"
+        role="button"
+        tabindex="0"
+      >
+        Verify contract details
+      </a>
+    </div>
+    <div
+      class="confirm-approve-content__card-wrapper"
+    >
+      <div
+        class="confirm-approve-content__card--no-border"
+      >
+        <div
+          class="confirm-approve-content__card-header"
+        >
+          <div
+            class="confirm-approve-content__card-header__symbol"
+          >
+            <span
+              class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-inherit"
+              style="mask-image: url('./images/icons/tag.svg');"
+            />
+          </div>
+          <div
+            class="confirm-approve-content__card-header__title"
+          >
+            Transaction fee
+          </div>
+          <div
+            class="box box--flex-direction-row box--width-1/6"
+          >
+            <a
+              class="button btn-link confirm-approve-content__small-blue-text"
+              role="button"
+              tabindex="0"
+            >
+              Edit
+            </a>
+          </div>
+        </div>
+        <div
+          class="confirm-approve-content__card-content"
+        >
+          <div
+            class="confirm-approve-content__transaction-details-content"
+          >
+            <div
+              class="confirm-approve-content__small-text"
+            >
+              A fee is associated with this request.
+            </div>
+            <div
+              class="confirm-approve-content__transaction-details-content__fee"
+            >
+              <div
+                class="confirm-approve-content__transaction-details-content__primary-fee"
+              >
+                $10.00
+              </div>
+              <div
+                class="confirm-approve-content__transaction-details-content__secondary-fee"
+              >
+                20 ETH
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="confirm-approve-content__card--no-border"
+      >
+        <div
+          class="confirm-approve-content__card-content"
+        >
+          <div
+            class="confirm-approve-content__custom-nonce-content"
+          >
+            <div
+              class="box confirm-approve-content__custom-nonce-header box--flex-direction-row box--justify-content-flex-start box--display-flex"
+            >
+              <h6
+                class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+              >
+                Nonce
+              </h6>
+              <a
+                class="button btn-link confirm-approve-content__custom-nonce-edit"
+                role="button"
+                tabindex="0"
+              >
+                Edit
+              </a>
+            </div>
+            <h6
+              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold mm-text--color-text-default box--flex-direction-row"
+            >
+              2
+            </h6>
+          </div>
+        </div>
+        <div
+          class="confirm-approve-content__view-full-tx-button-wrapper"
+        >
+          <div
+            class="confirm-approve-content__view-full-tx-button cursor-pointer"
+          >
+            <div
+              class="confirm-approve-content__small-blue-text"
+            >
+              View full transaction details
+            </div>
+            <i
+              class="fa fa-caret-down"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`ConfirmApproveContent Component should render Confirm approve page correctly and display fallback copy for when we are not able to retrieve a erc721 or erc1155 name in the setApprovalForAll screen and when giving a setApprovalForAll allowance 1`] = `
+<div>
+  <div
+    class="confirm-approve-content"
+  >
+    <div
+      class="box confirm-approve-content__icon-display-content box--display-flex box--flex-direction-row"
+    >
+      <div
+        class="box box--display-flex box--flex-direction-row box--align-items-center"
+      >
+        <div
+          class=""
+        >
+          <img
+            alt="https://metamask.github.io/test-dapp/"
+            class="url-icon confirm-approve-content__siteimage-identicon"
+            src="https://metamask.github.io/test-dapp/metamask-fox.svg"
+          />
+        </div>
+        <h6
+          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--margin-left-1 box--flex-direction-row"
+        >
+          https://metamask.github.io/test-dapp/
+        </h6>
+      </div>
+    </div>
+    <div
+      class="confirm-approve-content__title"
+      data-testid="confirm-approve-title"
+    >
+      <span>
+         
+        Allow access to and transfer all of your NFTs from 
+        <span
+          class="confirm-approve-content__approval-asset-title"
+        >
+          this collection
+        </span>
+        
+        ?
+         
+      </span>
+    </div>
+    <div
+      class="confirm-approve-content__description"
+    >
+      <span>
+         
+        This allows a third party to access and transfer all of your NFTs from 
+        <span
+          class="confirm-approve-content__approval-asset-title"
+        >
+          this collection
+        </span>
+        
+         without further notice until you revoke its access.
+         
+      </span>
+    </div>
+    <div
+      class="box box--margin-top-2 box--margin-bottom-4 box--flex-direction-row"
+    >
+      <a
+        class="button btn-link confirm-approve-content__verify-contract-details"
+        role="button"
+        tabindex="0"
+      >
+        Verify contract details
+      </a>
+    </div>
+    <div
+      class="confirm-approve-content__card-wrapper"
+    >
+      <div
+        class="confirm-approve-content__card--no-border"
+      >
+        <div
+          class="confirm-approve-content__card-header"
+        >
+          <div
+            class="confirm-approve-content__card-header__symbol"
+          >
+            <span
+              class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-inherit"
+              style="mask-image: url('./images/icons/tag.svg');"
+            />
+          </div>
+          <div
+            class="confirm-approve-content__card-header__title"
+          >
+            Transaction fee
+          </div>
+          <div
+            class="box box--flex-direction-row box--width-1/6"
+          >
+            <a
+              class="button btn-link confirm-approve-content__small-blue-text"
+              role="button"
+              tabindex="0"
+            >
+              Edit
+            </a>
+          </div>
+        </div>
+        <div
+          class="confirm-approve-content__card-content"
+        >
+          <div
+            class="confirm-approve-content__transaction-details-content"
+          >
+            <div
+              class="confirm-approve-content__small-text"
+            >
+              A fee is associated with this request.
+            </div>
+            <div
+              class="confirm-approve-content__transaction-details-content__fee"
+            >
+              <div
+                class="confirm-approve-content__transaction-details-content__primary-fee"
+              >
+                $10.00
+              </div>
+              <div
+                class="confirm-approve-content__transaction-details-content__secondary-fee"
+              >
+                20 ETH
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="confirm-approve-content__card--no-border"
+      >
+        <div
+          class="confirm-approve-content__card-content"
+        >
+          <div
+            class="confirm-approve-content__custom-nonce-content"
+          >
+            <div
+              class="box confirm-approve-content__custom-nonce-header box--flex-direction-row box--justify-content-flex-start box--display-flex"
+            >
+              <h6
+                class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+              >
+                Nonce
+              </h6>
+              <a
+                class="button btn-link confirm-approve-content__custom-nonce-edit"
+                role="button"
+                tabindex="0"
+              >
+                Edit
+              </a>
+            </div>
+            <h6
+              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold mm-text--color-text-default box--flex-direction-row"
+            >
+              2
+            </h6>
+          </div>
+        </div>
+        <div
+          class="confirm-approve-content__view-full-tx-button-wrapper"
+        >
+          <div
+            class="confirm-approve-content__view-full-tx-button cursor-pointer"
+          >
+            <div
+              class="confirm-approve-content__small-blue-text"
+            >
+              View full transaction details
+            </div>
+            <i
+              class="fa fa-caret-down"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`ConfirmApproveContent Component should render Confirm approve page correctly and display fallback copy for when we are not able to retrieve a erc721 or erc1155 name in the setApprovalForAll screen and when revoking a setApprovalForAll allowance 1`] = `
+<div>
+  <div
+    class="confirm-approve-content"
+  >
+    <div
+      class="box confirm-approve-content__icon-display-content box--display-flex box--flex-direction-row"
+    >
+      <div
+        class="box box--display-flex box--flex-direction-row box--align-items-center"
+      >
+        <div
+          class=""
+        >
+          <img
+            alt="https://metamask.github.io/test-dapp/"
+            class="url-icon confirm-approve-content__siteimage-identicon"
+            src="https://metamask.github.io/test-dapp/metamask-fox.svg"
+          />
+        </div>
+        <h6
+          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--margin-left-1 box--flex-direction-row"
+        >
+          https://metamask.github.io/test-dapp/
+        </h6>
+      </div>
+    </div>
+    <div
+      class="confirm-approve-content__title"
+      data-testid="confirm-approve-title"
+    >
+      <span>
+         
+        Revoke permission to access and transfer all of your NFTs from 
+        <span
+          class="confirm-approve-content__approval-asset-title"
+        >
+          this collection
+        </span>
+        
+        ?
+         
+      </span>
+    </div>
+    <div
+      class="confirm-approve-content__description"
+    >
+      <span>
+         
+        This revokes the permission for a third party to access and transfer all of your NFTs from 
+        <span
+          class="confirm-approve-content__approval-asset-title"
+        >
+          this collection
+        </span>
+        
+         without further notice.
+         
+      </span>
+    </div>
+    <div
+      class="box box--margin-top-2 box--margin-bottom-4 box--flex-direction-row"
+    >
+      <a
+        class="button btn-link confirm-approve-content__verify-contract-details"
+        role="button"
+        tabindex="0"
+      >
+        Verify contract details
+      </a>
+    </div>
+    <div
+      class="confirm-approve-content__card-wrapper"
+    >
+      <div
+        class="confirm-approve-content__card--no-border"
+      >
+        <div
+          class="confirm-approve-content__card-header"
+        >
+          <div
+            class="confirm-approve-content__card-header__symbol"
+          >
+            <span
+              class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-inherit"
+              style="mask-image: url('./images/icons/tag.svg');"
+            />
+          </div>
+          <div
+            class="confirm-approve-content__card-header__title"
+          >
+            Transaction fee
+          </div>
+          <div
+            class="box box--flex-direction-row box--width-1/6"
+          >
+            <a
+              class="button btn-link confirm-approve-content__small-blue-text"
+              role="button"
+              tabindex="0"
+            >
+              Edit
+            </a>
+          </div>
+        </div>
+        <div
+          class="confirm-approve-content__card-content"
+        >
+          <div
+            class="confirm-approve-content__transaction-details-content"
+          >
+            <div
+              class="confirm-approve-content__small-text"
+            >
+              A fee is associated with this request.
+            </div>
+            <div
+              class="confirm-approve-content__transaction-details-content__fee"
+            >
+              <div
+                class="confirm-approve-content__transaction-details-content__primary-fee"
+              >
+                $10.00
+              </div>
+              <div
+                class="confirm-approve-content__transaction-details-content__secondary-fee"
+              >
+                20 ETH
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="confirm-approve-content__card--no-border"
+      >
+        <div
+          class="confirm-approve-content__card-content"
+        >
+          <div
+            class="confirm-approve-content__custom-nonce-content"
+          >
+            <div
+              class="box confirm-approve-content__custom-nonce-header box--flex-direction-row box--justify-content-flex-start box--display-flex"
+            >
+              <h6
+                class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+              >
+                Nonce
+              </h6>
+              <a
+                class="button btn-link confirm-approve-content__custom-nonce-edit"
+                role="button"
+                tabindex="0"
+              >
+                Edit
+              </a>
+            </div>
+            <h6
+              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold mm-text--color-text-default box--flex-direction-row"
+            >
+              2
+            </h6>
+          </div>
+        </div>
+        <div
+          class="confirm-approve-content__view-full-tx-button-wrapper"
+        >
+          <div
+            class="confirm-approve-content__view-full-tx-button cursor-pointer"
+          >
+            <div
+              class="confirm-approve-content__small-blue-text"
+            >
+              View full transaction details
+            </div>
+            <i
+              class="fa fa-caret-down"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
index c6cd73087..3ec03a1c9 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
@@ -210,9 +210,13 @@ export default class ConfirmApproveContent extends Component {
 
   renderERC721OrERC1155PermissionContent() {
     const { t } = this.context;
-    const { origin, toAddress, isContract, isSetApproveForAll } = this.props;
+    const { origin, toAddress, isContract, isSetApproveForAll, tokenSymbol } =
+      this.props;
 
     const titleTokenDescription = this.getTitleTokenDescription();
+    const approvedAssetText = tokenSymbol
+      ? t('allOfYour', [titleTokenDescription])
+      : t('allYourNFTsOf', [titleTokenDescription]);
 
     const displayedAddress = isContract
       ? `${t('contract')} (${addressSummary(toAddress)})`
@@ -227,9 +231,7 @@ export default class ConfirmApproveContent extends Component {
             {t('approvedAsset')}:
           </div>
           <div className="confirm-approve-content__medium-text">
-            {isSetApproveForAll
-              ? t('allOfYour', [titleTokenDescription])
-              : titleTokenDescription}
+            {isSetApproveForAll ? approvedAssetText : titleTokenDescription}
           </div>
         </div>
         <div className="flex-row">
@@ -376,7 +378,7 @@ export default class ConfirmApproveContent extends Component {
       if (assetName || tokenSymbol) {
         titleTokenDescription = `${assetName ?? tokenSymbol}`;
       } else {
-        titleTokenDescription = t('nft');
+        titleTokenDescription = t('thisCollection');
       }
     }
 
@@ -451,9 +453,20 @@ export default class ConfirmApproveContent extends Component {
     let title;
 
     if (isSetApproveForAll) {
-      title = t('approveAllTokensTitle', [titleTokenDescription]);
-      if (isApprovalOrRejection === false) {
-        title = t('revokeAllTokensTitle', [titleTokenDescription]);
+      if (tokenSymbol) {
+        title = t('approveAllTokensTitle', [titleTokenDescription]);
+        if (isApprovalOrRejection === false) {
+          title = t('revokeAllTokensTitle', [titleTokenDescription]);
+        }
+      } else {
+        title = t('approveAllTokensTitleWithoutSymbol', [
+          titleTokenDescription,
+        ]);
+        if (isApprovalOrRejection === false) {
+          title = t('revokeAllTokensTitleWithoutSymbol', [
+            titleTokenDescription,
+          ]);
+        }
       }
     } else if (
       assetStandard === TokenStandard.ERC721 ||
@@ -485,9 +498,15 @@ export default class ConfirmApproveContent extends Component {
     let description = t('trustSiteApprovePermission', [grantee]);
 
     if (isSetApproveForAll && isApprovalOrRejection === false) {
-      description = t('revokeApproveForAllDescription', [
-        this.getTitleTokenDescription(),
-      ]);
+      if (tokenSymbol) {
+        description = t('revokeApproveForAllDescription', [
+          this.getTitleTokenDescription(),
+        ]);
+      } else {
+        description = t('revokeApproveForAllDescriptionWithoutSymbol', [
+          this.getTitleTokenDescription(),
+        ]);
+      }
     } else if (
       isSetApproveForAll ||
       assetStandard === TokenStandard.ERC721 ||
@@ -496,7 +515,13 @@ export default class ConfirmApproveContent extends Component {
       (assetName && tokenId) ||
       (tokenSymbol && tokenId)
     ) {
-      description = t('approveTokenDescription');
+      if (tokenSymbol) {
+        description = t('approveTokenDescription');
+      } else {
+        description = t('approveTokenDescriptionWithoutSymbol', [
+          this.getTitleTokenDescription(),
+        ]);
+      }
     }
     return description;
   }
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
index 952a38af6..87f3a13f2 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
@@ -37,6 +37,8 @@ const props = {
   rpcPrefs: {},
   isContract: true,
   useCurrencyRateCheck: true,
+  isSetApproveForAll: false,
+  isApprovalOrRejection: true,
 };
 
 describe('ConfirmApproveContent Component', () => {
@@ -281,4 +283,46 @@ describe('ConfirmApproveContent Component', () => {
       ),
     ).toBeInTheDocument();
   });
+
+  it('should render Confirm approve page correctly and display fallback copy for when we are able to retrieve a erc721 or erc1155 name in the setApprovalForAll screen and when giving a setApprovalForAll allowance', () => {
+    const { container } = renderComponent({
+      ...props,
+      tokenSymbol: 'ZenAcademy',
+      isSetApproveForAll: true,
+    });
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render Confirm approve page correctly and display fallback copy for when we are not able to retrieve a erc721 or erc1155 name in the setApprovalForAll screen and when giving a setApprovalForAll allowance', () => {
+    const { container } = renderComponent({
+      ...props,
+      tokenSymbol: '',
+      isSetApproveForAll: true,
+    });
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render Confirm approve page correctly and display fallback copy for when we are able to retrieve a erc721 or erc1155 name in the setApprovalForAll screen and when revoking a setApprovalForAll allowance', () => {
+    const { container } = renderComponent({
+      ...props,
+      tokenSymbol: 'ZenAcademy',
+      isSetApproveForAll: true,
+      isApprovalOrRejection: false,
+    });
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render Confirm approve page correctly and display fallback copy for when we are not able to retrieve a erc721 or erc1155 name in the setApprovalForAll screen and when revoking a setApprovalForAll allowance', () => {
+    const { container } = renderComponent({
+      ...props,
+      tokenSymbol: '',
+      isSetApproveForAll: true,
+      isApprovalOrRejection: false,
+    });
+
+    expect(container).toMatchSnapshot();
+  });
 });

From 5e4e98b0c379deffbdc67439170f2e3acca88cb8 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Mon, 20 Mar 2023 16:24:26 -0700
Subject: [PATCH 033/129] Updating jest config to ignore all stories files
 including js and tsx (#18231)

---
 jest.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jest.config.js b/jest.config.js
index a16469ce1..ba0c5219e 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -14,7 +14,7 @@ module.exports = {
     '<rootDir>/development/fitness-functions/**/*.test.(js|ts|tsx)',
   ],
   coverageDirectory: './coverage',
-  coveragePathIgnorePatterns: ['.stories.js', '.snap'],
+  coveragePathIgnorePatterns: ['.stories.*', '.snap'],
   coverageReporters: ['json'],
   reporters: [
     'default',

From a854cfdb930f2f6bf850371383f6880f22b76b3a Mon Sep 17 00:00:00 2001
From: aleksandar-mihajlovic
 <120601632+aleksandar-mihajlovic@users.noreply.github.com>
Date: Tue, 21 Mar 2023 12:39:36 +0100
Subject: [PATCH 034/129] Changed text for review spending cap copy (#18214)

---
 app/_locales/en/messages.json                   | 2 +-
 test/e2e/tests/custom-token-add-approve.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 7b45679ff..9d3aaeb94 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3215,7 +3215,7 @@
     "message": "Reveal seed phrase"
   },
   "reviewSpendingCap": {
-    "message": "Review your spending cap"
+    "message": "Review the spending cap for your"
   },
   "revokeAllTokensTitle": {
     "message": "Revoke permission to access and transfer all of your $1?",
diff --git a/test/e2e/tests/custom-token-add-approve.spec.js b/test/e2e/tests/custom-token-add-approve.spec.js
index 62700d389..b520f1bcf 100644
--- a/test/e2e/tests/custom-token-add-approve.spec.js
+++ b/test/e2e/tests/custom-token-add-approve.spec.js
@@ -162,7 +162,7 @@ describe('Create token, approve token and approve token without gas', function (
         await driver.clickElement({ text: 'Next', tag: 'button' });
 
         await driver.findElement({
-          text: 'Review your spending cap',
+          text: 'Review the spending cap for your',
           tag: 'div',
         });
 

From d6b49ae3835d13a094cbcca90562ed86fd5256fc Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Tue, 21 Mar 2023 12:13:22 -0230
Subject: [PATCH 035/129] Refactor KeyringTypes constant (#17490)

The `HardwareKeyringTypes` constant has been renamed to `KeyringTypes`
and moved to a separate constants module, to reflect that it contains
more than just hardware wallet keyring types. This corrects a mistake
made recently during a TypeScript conversion.
---
 .storybook/test-data.js                       | 12 ++---
 app/scripts/lib/seed-phrase-verifier.js       |  4 +-
 app/scripts/lib/seed-phrase-verifier.test.js  |  4 +-
 app/scripts/metamask-controller.js            | 50 +++++++++----------
 app/scripts/metamask-controller.test.js       | 20 ++++----
 shared/constants/hardware-wallets.ts          |  8 +--
 shared/constants/keyring.ts                   | 17 +++++++
 test/jest/mock-store.js                       | 11 ++--
 .../app/account-menu/account-menu.test.js     |  6 +--
 .../app/account-menu/keyring-label.js         | 16 +++---
 .../unconnected-account-alert.test.js         |  4 +-
 .../app/menu-bar/account-options-menu.js      |  4 +-
 ui/components/app/menu-bar/menu-bar.test.js   |  4 +-
 .../app/wallet-overview/eth-overview.test.js  |  6 +--
 .../wallet-overview/token-overview.test.js    |  6 +--
 ui/ducks/metamask/metamask.js                 |  6 +--
 ui/ducks/send/send.test.js                    |  4 +-
 .../confirm-transaction-base.test.js          |  4 +-
 ui/pages/mobile-sync/mobile-sync.component.js |  4 +-
 ui/pages/send/send.test.js                    |  4 +-
 .../token-allowance/token-allowance.test.js   |  6 +--
 ui/selectors/selectors.js                     | 17 +++----
 ui/selectors/selectors.test.js                | 20 ++++----
 23 files changed, 120 insertions(+), 117 deletions(-)
 create mode 100644 shared/constants/keyring.ts

diff --git a/.storybook/test-data.js b/.storybook/test-data.js
index c85ab7259..65bb7fb4c 100644
--- a/.storybook/test-data.js
+++ b/.storybook/test-data.js
@@ -1,5 +1,5 @@
 import { draftTransactionInitialState } from '../ui/ducks/send';
-import { HardwareKeyringTypes } from '../shared/constants/hardware-wallets';
+import { KeyringType } from '../shared/constants/keyring';
 
 const state = {
   invalidCustomNetwork: {
@@ -1168,14 +1168,14 @@ const state = {
     unapprovedTypedMessages: {},
     unapprovedTypedMessagesCount: 0,
     keyringTypes: [
-      HardwareKeyringTypes.imported,
-      HardwareKeyringTypes.hdKeyTree,
-      HardwareKeyringTypes.trezor,
-      HardwareKeyringTypes.ledger,
+      KeyringType.imported,
+      KeyringType.hdKeyTree,
+      KeyringType.trezor,
+      KeyringType.ledger,
     ],
     keyrings: [
       {
-        type: HardwareKeyringTypes.hdKeyTree,
+        type: KeyringType.hdKeyTree,
         accounts: [
           '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
           '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js
index 5fcaf4481..28c0b856d 100644
--- a/app/scripts/lib/seed-phrase-verifier.js
+++ b/app/scripts/lib/seed-phrase-verifier.js
@@ -1,7 +1,7 @@
 import { KeyringController } from '@metamask/eth-keyring-controller';
 import log from 'loglevel';
 
-import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../shared/constants/keyring';
 
 const seedPhraseVerifier = {
   /**
@@ -23,7 +23,7 @@ const seedPhraseVerifier = {
 
     const keyringController = new KeyringController({});
     const keyringBuilder = keyringController.getKeyringBuilderForType(
-      HardwareKeyringTypes.hdKeyTree,
+      KeyringType.hdKeyTree,
     );
     const keyring = keyringBuilder();
     const opts = {
diff --git a/app/scripts/lib/seed-phrase-verifier.test.js b/app/scripts/lib/seed-phrase-verifier.test.js
index bf888f79b..be549034c 100644
--- a/app/scripts/lib/seed-phrase-verifier.test.js
+++ b/app/scripts/lib/seed-phrase-verifier.test.js
@@ -6,13 +6,13 @@ import { cloneDeep } from 'lodash';
 import { KeyringController } from '@metamask/eth-keyring-controller';
 import firstTimeState from '../first-time-state';
 import mockEncryptor from '../../../test/lib/mock-encryptor';
-import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../shared/constants/keyring';
 import seedPhraseVerifier from './seed-phrase-verifier';
 
 describe('SeedPhraseVerifier', () => {
   describe('verifyAccounts', () => {
     const password = 'passw0rd1';
-    const { hdKeyTree } = HardwareKeyringTypes;
+    const { hdKeyTree } = KeyringType;
 
     let keyringController;
     let primaryKeyring;
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 3e567c5d6..0a395106a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -74,10 +74,8 @@ import {
   SWAPS_CLIENT_ID,
 } from '../../shared/constants/swaps';
 import { CHAIN_IDS, NETWORK_TYPES } from '../../shared/constants/network';
-import {
-  HardwareDeviceNames,
-  HardwareKeyringTypes,
-} from '../../shared/constants/hardware-wallets';
+import { HardwareDeviceNames } from '../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../shared/constants/keyring';
 import {
   CaveatTypes,
   RestrictedMethods,
@@ -2372,7 +2370,7 @@ export default class MetamaskController extends EventEmitter {
       );
 
       const [primaryKeyring] = keyringController.getKeyringsByType(
-        HardwareKeyringTypes.hdKeyTree,
+        KeyringType.hdKeyTree,
       );
       if (!primaryKeyring) {
         throw new Error('MetamaskController - No HD Key Tree found');
@@ -2496,10 +2494,10 @@ export default class MetamaskController extends EventEmitter {
 
     // Accounts
     const [hdKeyring] = this.keyringController.getKeyringsByType(
-      HardwareKeyringTypes.hdKeyTree,
+      KeyringType.hdKeyTree,
     );
     const simpleKeyPairKeyrings = this.keyringController.getKeyringsByType(
-      HardwareKeyringTypes.hdKeyTree,
+      KeyringType.hdKeyTree,
     );
     const hdAccounts = await hdKeyring.getAccounts();
     const simpleKeyPairKeyringAccounts = await Promise.all(
@@ -2663,7 +2661,7 @@ export default class MetamaskController extends EventEmitter {
    */
   getPrimaryKeyringMnemonic() {
     const [keyring] = this.keyringController.getKeyringsByType(
-      HardwareKeyringTypes.hdKeyTree,
+      KeyringType.hdKeyTree,
     );
     if (!keyring.mnemonic) {
       throw new Error('Primary keyring mnemonic unavailable.');
@@ -2803,12 +2801,12 @@ export default class MetamaskController extends EventEmitter {
   async getAccountType(address) {
     const keyring = await this.keyringController.getKeyringForAccount(address);
     switch (keyring.type) {
-      case HardwareKeyringTypes.trezor:
-      case HardwareKeyringTypes.lattice:
-      case HardwareKeyringTypes.qr:
-      case HardwareKeyringTypes.ledger:
+      case KeyringType.trezor:
+      case KeyringType.lattice:
+      case KeyringType.qr:
+      case KeyringType.ledger:
         return 'hardware';
-      case HardwareKeyringTypes.imported:
+      case KeyringType.imported:
         return 'imported';
       default:
         return 'MetaMask';
@@ -2826,14 +2824,14 @@ export default class MetamaskController extends EventEmitter {
   async getDeviceModel(address) {
     const keyring = await this.keyringController.getKeyringForAccount(address);
     switch (keyring.type) {
-      case HardwareKeyringTypes.trezor:
+      case KeyringType.trezor:
         return keyring.getModel();
-      case HardwareKeyringTypes.qr:
+      case KeyringType.qr:
         return keyring.getName();
-      case HardwareKeyringTypes.ledger:
+      case KeyringType.ledger:
         // TODO: get model after ledger keyring exposes method
         return HardwareDeviceNames.ledger;
-      case HardwareKeyringTypes.lattice:
+      case KeyringType.lattice:
         // TODO: get model after lattice keyring exposes method
         return HardwareDeviceNames.lattice;
       default:
@@ -2907,7 +2905,7 @@ export default class MetamaskController extends EventEmitter {
    */
   async addNewAccount(accountCount) {
     const [primaryKeyring] = this.keyringController.getKeyringsByType(
-      HardwareKeyringTypes.hdKeyTree,
+      KeyringType.hdKeyTree,
     );
     if (!primaryKeyring) {
       throw new Error('MetamaskController - No HD Key Tree found');
@@ -2952,7 +2950,7 @@ export default class MetamaskController extends EventEmitter {
    */
   async verifySeedPhrase() {
     const [primaryKeyring] = this.keyringController.getKeyringsByType(
-      HardwareKeyringTypes.hdKeyTree,
+      KeyringType.hdKeyTree,
     );
     if (!primaryKeyring) {
       throw new Error('MetamaskController - No HD Key Tree found');
@@ -3074,7 +3072,7 @@ export default class MetamaskController extends EventEmitter {
   async importAccountWithStrategy(strategy, args) {
     const privateKey = await accountImporter.importAccount(strategy, args);
     const keyring = await this.keyringController.addNewKeyring(
-      HardwareKeyringTypes.imported,
+      KeyringType.imported,
       [privateKey],
     );
     const [firstAccount] = await keyring.getAccounts();
@@ -3229,7 +3227,7 @@ export default class MetamaskController extends EventEmitter {
     const keyring = await this.keyringController.getKeyringForAccount(address);
 
     switch (keyring.type) {
-      case HardwareKeyringTypes.ledger: {
+      case KeyringType.ledger: {
         return new Promise((_, reject) => {
           reject(
             new Error('Ledger does not support eth_getEncryptionPublicKey.'),
@@ -3237,7 +3235,7 @@ export default class MetamaskController extends EventEmitter {
         });
       }
 
-      case HardwareKeyringTypes.trezor: {
+      case KeyringType.trezor: {
         return new Promise((_, reject) => {
           reject(
             new Error('Trezor does not support eth_getEncryptionPublicKey.'),
@@ -3245,7 +3243,7 @@ export default class MetamaskController extends EventEmitter {
         });
       }
 
-      case HardwareKeyringTypes.lattice: {
+      case KeyringType.lattice: {
         return new Promise((_, reject) => {
           reject(
             new Error('Lattice does not support eth_getEncryptionPublicKey.'),
@@ -3253,7 +3251,7 @@ export default class MetamaskController extends EventEmitter {
         });
       }
 
-      case HardwareKeyringTypes.qr: {
+      case KeyringType.qr: {
         return Promise.reject(
           new Error('QR hardware does not support eth_getEncryptionPublicKey.'),
         );
@@ -4296,14 +4294,14 @@ export default class MetamaskController extends EventEmitter {
    */
   setLocked() {
     const [trezorKeyring] = this.keyringController.getKeyringsByType(
-      HardwareKeyringTypes.trezor,
+      KeyringType.trezor,
     );
     if (trezorKeyring) {
       trezorKeyring.dispose();
     }
 
     const [ledgerKeyring] = this.keyringController.getKeyringsByType(
-      HardwareKeyringTypes.ledger,
+      KeyringType.ledger,
     );
     ledgerKeyring?.destroy?.();
 
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 03e335a26..7506c17cb 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -11,10 +11,8 @@ import { TransactionStatus } from '../../shared/constants/transaction';
 import createTxMeta from '../../test/lib/createTxMeta';
 import { NETWORK_TYPES } from '../../shared/constants/network';
 import { createTestProviderTools } from '../../test/stub/provider';
-import {
-  HardwareDeviceNames,
-  HardwareKeyringTypes,
-} from '../../shared/constants/hardware-wallets';
+import { HardwareDeviceNames } from '../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../shared/constants/keyring';
 import { deferredPromise } from './lib/util';
 
 const Ganache = require('../../test/e2e/ganache');
@@ -275,7 +273,7 @@ describe('MetaMaskController', function () {
     it('adds private key to keyrings in KeyringController', async function () {
       const simpleKeyrings =
         metamaskController.keyringController.getKeyringsByType(
-          HardwareKeyringTypes.imported,
+          KeyringType.imported,
         );
       const pubAddressHexArr = await simpleKeyrings[0].getAccounts();
       const privKeyHex = await simpleKeyrings[0].exportAccount(
@@ -555,11 +553,11 @@ describe('MetaMaskController', function () {
         .catch(() => null);
       const keyrings =
         await metamaskController.keyringController.getKeyringsByType(
-          HardwareKeyringTypes.trezor,
+          KeyringType.trezor,
         );
       assert.deepEqual(
         metamaskController.keyringController.addNewKeyring.getCall(0).args,
-        [HardwareKeyringTypes.trezor],
+        [KeyringType.trezor],
       );
       assert.equal(keyrings.length, 1);
     });
@@ -571,11 +569,11 @@ describe('MetaMaskController', function () {
         .catch(() => null);
       const keyrings =
         await metamaskController.keyringController.getKeyringsByType(
-          HardwareKeyringTypes.ledger,
+          KeyringType.ledger,
         );
       assert.deepEqual(
         metamaskController.keyringController.addNewKeyring.getCall(0).args,
-        [HardwareKeyringTypes.ledger],
+        [KeyringType.ledger],
       );
       assert.equal(keyrings.length, 1);
     });
@@ -651,7 +649,7 @@ describe('MetaMaskController', function () {
       await metamaskController.forgetDevice(HardwareDeviceNames.trezor);
       const keyrings =
         await metamaskController.keyringController.getKeyringsByType(
-          HardwareKeyringTypes.trezor,
+          KeyringType.trezor,
         );
 
       assert.deepEqual(keyrings[0].accounts, []);
@@ -711,7 +709,7 @@ describe('MetaMaskController', function () {
     it('should set unlockedAccount in the keyring', async function () {
       const keyrings =
         await metamaskController.keyringController.getKeyringsByType(
-          HardwareKeyringTypes.trezor,
+          KeyringType.trezor,
         );
       assert.equal(keyrings[0].unlockedAccount, accountToUnlock);
     });
diff --git a/shared/constants/hardware-wallets.ts b/shared/constants/hardware-wallets.ts
index 71cdeb038..4f549aa2f 100644
--- a/shared/constants/hardware-wallets.ts
+++ b/shared/constants/hardware-wallets.ts
@@ -1,15 +1,11 @@
 /**
- * Accounts can be instantiated from simple, HD or the multiple hardware wallet
- * keyring types. Both simple and HD are treated as default but we do special
- * case accounts managed by a hardware wallet.
+ * Hardware wallets supported by MetaMask.
  */
-export enum HardwareKeyringTypes {
+export enum HardwareKeyringType {
   ledger = 'Ledger Hardware',
   trezor = 'Trezor Hardware',
   lattice = 'Lattice Hardware',
   qr = 'QR Hardware Wallet Device',
-  hdKeyTree = 'HD Key Tree',
-  imported = 'Simple Key Pair',
 }
 
 export enum HardwareKeyringNames {
diff --git a/shared/constants/keyring.ts b/shared/constants/keyring.ts
new file mode 100644
index 000000000..f285fa468
--- /dev/null
+++ b/shared/constants/keyring.ts
@@ -0,0 +1,17 @@
+import { HardwareKeyringType } from './hardware-wallets';
+
+/**
+ * These are the keyrings that are managed entirely by MetaMask.
+ */
+export enum InternalKeyringType {
+  hdKeyTree = 'HD Key Tree',
+  imported = 'Simple Key Pair',
+}
+
+/**
+ * All keyrings supported by MetaMask.
+ */
+export const KeyringType = {
+  ...HardwareKeyringType,
+  ...InternalKeyringType,
+};
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index b0dd8eaee..80c477a10 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -1,5 +1,5 @@
 import { CHAIN_IDS } from '../../shared/constants/network';
-import { HardwareKeyringTypes } from '../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../shared/constants/keyring';
 
 const createGetSmartTransactionFeesApiResponse = () => {
   return {
@@ -252,13 +252,10 @@ export const createSwapsMockStore = () => {
         },
       },
       selectedAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-      keyringTypes: [
-        HardwareKeyringTypes.imported,
-        HardwareKeyringTypes.hdKeyTree,
-      ],
+      keyringTypes: [KeyringType.imported, KeyringType.hdKeyTree],
       keyrings: [
         {
-          type: HardwareKeyringTypes.hdKeyTree,
+          type: KeyringType.hdKeyTree,
           accounts: [
             '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
             'c5b8dbac4c1d3f152cdeb400e2313f309c410acb',
@@ -266,7 +263,7 @@ export const createSwapsMockStore = () => {
           ],
         },
         {
-          type: HardwareKeyringTypes.imported,
+          type: KeyringType.imported,
           accounts: ['0xd85a4b6a394794842887b8284293d69163007bbb'],
         },
       ],
diff --git a/ui/components/app/account-menu/account-menu.test.js b/ui/components/app/account-menu/account-menu.test.js
index 494171fa0..f7ded9a92 100644
--- a/ui/components/app/account-menu/account-menu.test.js
+++ b/ui/components/app/account-menu/account-menu.test.js
@@ -3,7 +3,7 @@ import sinon from 'sinon';
 import configureMockStore from 'redux-mock-store';
 import { fireEvent, screen } from '@testing-library/react';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
-import { HardwareKeyringTypes } from '../../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../../shared/constants/keyring';
 import AccountMenu from '.';
 
 describe('Account Menu', () => {
@@ -37,11 +37,11 @@ describe('Account Menu', () => {
     ],
     keyrings: [
       {
-        type: HardwareKeyringTypes.hdKeyTree,
+        type: KeyringType.hdKeyTree,
         accounts: ['0xAdress'],
       },
       {
-        type: HardwareKeyringTypes.imported,
+        type: KeyringType.imported,
         accounts: ['0x1'],
       },
     ],
diff --git a/ui/components/app/account-menu/keyring-label.js b/ui/components/app/account-menu/keyring-label.js
index 985c54ae5..c4cf8b85c 100644
--- a/ui/components/app/account-menu/keyring-label.js
+++ b/ui/components/app/account-menu/keyring-label.js
@@ -2,10 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import {
-  HardwareKeyringNames,
-  HardwareKeyringTypes,
-} from '../../../../shared/constants/hardware-wallets';
+import { HardwareKeyringNames } from '../../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../../shared/constants/keyring';
 
 export default function KeyRingLabel({ keyring }) {
   const t = useI18nContext();
@@ -19,19 +17,19 @@ export default function KeyRingLabel({ keyring }) {
   const { type } = keyring;
 
   switch (type) {
-    case HardwareKeyringTypes.qr:
+    case KeyringType.qr:
       label = HardwareKeyringNames.qr;
       break;
-    case HardwareKeyringTypes.imported:
+    case KeyringType.imported:
       label = t('imported');
       break;
-    case HardwareKeyringTypes.trezor:
+    case KeyringType.trezor:
       label = HardwareKeyringNames.trezor;
       break;
-    case HardwareKeyringTypes.ledger:
+    case KeyringType.ledger:
       label = HardwareKeyringNames.ledger;
       break;
-    case HardwareKeyringTypes.lattice:
+    case KeyringType.lattice:
       label = HardwareKeyringNames.lattice;
       break;
     default:
diff --git a/ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.test.js b/ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.test.js
index 42fe9d67e..c710da525 100644
--- a/ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.test.js
+++ b/ui/components/app/alerts/unconnected-account-alert/unconnected-account-alert.test.js
@@ -11,7 +11,7 @@ import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 
 import * as actions from '../../../../store/actions';
 import { CHAIN_IDS } from '../../../../../shared/constants/network';
-import { HardwareKeyringTypes } from '../../../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../../../shared/constants/keyring';
 
 import UnconnectedAccountAlert from '.';
 
@@ -49,7 +49,7 @@ describe('Unconnected Account Alert', () => {
 
   const keyrings = [
     {
-      type: HardwareKeyringTypes.hdKeyTree,
+      type: KeyringType.hdKeyTree,
       accounts: [
         '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
         '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b',
diff --git a/ui/components/app/menu-bar/account-options-menu.js b/ui/components/app/menu-bar/account-options-menu.js
index 554304795..deeb4e0a3 100644
--- a/ui/components/app/menu-bar/account-options-menu.js
+++ b/ui/components/app/menu-bar/account-options-menu.js
@@ -21,7 +21,7 @@ import {
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
-import { HardwareKeyringTypes } from '../../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../../shared/constants/keyring';
 import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { ICON_NAMES } from '../../component-library';
@@ -42,7 +42,7 @@ export default function AccountOptionsMenu({ anchorElement, onClose }) {
   const trackEvent = useContext(MetaMetricsContext);
   const blockExplorerLinkText = useSelector(getBlockExplorerLinkText);
 
-  const isRemovable = keyring.type !== HardwareKeyringTypes.hdKeyTree;
+  const isRemovable = keyring.type !== KeyringType.hdKeyTree;
 
   const routeToAddBlockExplorerUrl = () => {
     history.push(`${NETWORKS_ROUTE}#blockExplorerUrl`);
diff --git a/ui/components/app/menu-bar/menu-bar.test.js b/ui/components/app/menu-bar/menu-bar.test.js
index c834c6076..2a148a54a 100644
--- a/ui/components/app/menu-bar/menu-bar.test.js
+++ b/ui/components/app/menu-bar/menu-bar.test.js
@@ -3,7 +3,7 @@ import configureStore from 'redux-mock-store';
 import { fireEvent, screen, waitFor } from '@testing-library/react';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
-import { HardwareKeyringTypes } from '../../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../../shared/constants/keyring';
 import MenuBar from './menu-bar';
 
 const initState = {
@@ -21,7 +21,7 @@ const initState = {
     },
     keyrings: [
       {
-        type: HardwareKeyringTypes.hdKeyTree,
+        type: KeyringType.hdKeyTree,
         accounts: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
       },
     ],
diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js
index 0d3090762..c73377199 100644
--- a/ui/components/app/wallet-overview/eth-overview.test.js
+++ b/ui/components/app/wallet-overview/eth-overview.test.js
@@ -4,7 +4,7 @@ import thunk from 'redux-thunk';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { renderWithProvider } from '../../../../test/jest/rendering';
-import { HardwareKeyringTypes } from '../../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../../shared/constants/keyring';
 import EthOverview from './eth-overview';
 
 // Mock BUYABLE_CHAINS_MAP
@@ -56,11 +56,11 @@ describe('EthOverview', () => {
       selectedAddress: '0x1',
       keyrings: [
         {
-          type: HardwareKeyringTypes.imported,
+          type: KeyringType.imported,
           accounts: ['0x1', '0x2'],
         },
         {
-          type: HardwareKeyringTypes.ledger,
+          type: KeyringType.ledger,
           accounts: [],
         },
       ],
diff --git a/ui/components/app/wallet-overview/token-overview.test.js b/ui/components/app/wallet-overview/token-overview.test.js
index c46e31f3b..9b2769181 100644
--- a/ui/components/app/wallet-overview/token-overview.test.js
+++ b/ui/components/app/wallet-overview/token-overview.test.js
@@ -4,7 +4,7 @@ import thunk from 'redux-thunk';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { renderWithProvider } from '../../../../test/jest/rendering';
-import { HardwareKeyringTypes } from '../../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../../shared/constants/keyring';
 import TokenOverview from './token-overview';
 
 // Mock BUYABLE_CHAINS_MAP
@@ -42,11 +42,11 @@ describe('TokenOverview', () => {
       selectedAddress: '0x1',
       keyrings: [
         {
-          type: HardwareKeyringTypes.hdKeyTree,
+          type: KeyringType.hdKeyTree,
           accounts: ['0x1', '0x2'],
         },
         {
-          type: HardwareKeyringTypes.ledger,
+          type: KeyringType.ledger,
           accounts: [],
         },
       ],
diff --git a/ui/ducks/metamask/metamask.js b/ui/ducks/metamask/metamask.js
index 2fa9a3ca4..cd3adaca8 100644
--- a/ui/ducks/metamask/metamask.js
+++ b/ui/ducks/metamask/metamask.js
@@ -14,7 +14,7 @@ import {
 import { updateTransactionGasFees } from '../../store/actions';
 import { setCustomGasLimit, setCustomGasPrice } from '../gas/gas.duck';
 
-import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../shared/constants/keyring';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { stripHexPrefix } from '../../../shared/modules/hexstring-utils';
 import {
@@ -407,7 +407,7 @@ export function getLedgerTransportType(state) {
 export function isAddressLedger(state, address) {
   const keyring = findKeyringForAddress(state, address);
 
-  return keyring?.type === HardwareKeyringTypes.ledger;
+  return keyring?.type === KeyringType.ledger;
 }
 
 /**
@@ -419,6 +419,6 @@ export function isAddressLedger(state, address) {
  */
 export function doesUserHaveALedgerAccount(state) {
   return state.metamask.keyrings.some((kr) => {
-    return kr.type === HardwareKeyringTypes.ledger;
+    return kr.type === KeyringType.ledger;
   });
 }
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index 549bf4225..7a3a789a7 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -13,7 +13,7 @@ import {
 } from '../../pages/send/send.constants';
 import { CHAIN_IDS } from '../../../shared/constants/network';
 import { GasEstimateTypes, GAS_LIMITS } from '../../../shared/constants/gas';
-import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../shared/constants/keyring';
 import {
   AssetType,
   TokenStandard,
@@ -1278,7 +1278,7 @@ describe('Send Slice', () => {
             identities: { '0xAddress': { address: '0xAddress' } },
             keyrings: [
               {
-                type: HardwareKeyringTypes.hdKeyTree,
+                type: KeyringType.hdKeyTree,
                 accounts: ['0xAddress'],
               },
             ],
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js
index 5029bd814..326af8c73 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js
@@ -6,7 +6,7 @@ import { renderWithProvider } from '../../../test/lib/render-helpers';
 import { setBackgroundConnection } from '../../../test/jest';
 import { INITIAL_SEND_STATE_FOR_EXISTING_DRAFT } from '../../../test/jest/mocks';
 import { GasEstimateTypes } from '../../../shared/constants/gas';
-import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../shared/constants/keyring';
 import { CHAIN_IDS } from '../../../shared/constants/network';
 import { domainInitialState } from '../../ducks/domains';
 
@@ -54,7 +54,7 @@ const baseStore = {
     selectedAddress: '0x0',
     keyrings: [
       {
-        type: HardwareKeyringTypes.hdKeyTree,
+        type: KeyringType.hdKeyTree,
         accounts: ['0x0'],
       },
     ],
diff --git a/ui/pages/mobile-sync/mobile-sync.component.js b/ui/pages/mobile-sync/mobile-sync.component.js
index b46a5a7b9..3c1996e73 100644
--- a/ui/pages/mobile-sync/mobile-sync.component.js
+++ b/ui/pages/mobile-sync/mobile-sync.component.js
@@ -8,7 +8,7 @@ import qrCode from 'qrcode-generator';
 import Button from '../../components/ui/button';
 import LoadingScreen from '../../components/ui/loading-screen';
 import { MINUTE, SECOND } from '../../../shared/constants/time';
-import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../shared/constants/keyring';
 
 const PASSWORD_PROMPT_SCREEN = 'PASSWORD_PROMPT_SCREEN';
 const REVEAL_SEED_SCREEN = 'REVEAL_SEED_SCREEN';
@@ -82,7 +82,7 @@ export default class MobileSyncPage extends Component {
   async exportAccounts() {
     const addresses = [];
     this.props.keyrings.forEach((keyring) => {
-      if (keyring.type === HardwareKeyringTypes.imported) {
+      if (keyring.type === KeyringType.imported) {
         addresses.push(keyring.accounts[0]);
       }
     });
diff --git a/ui/pages/send/send.test.js b/ui/pages/send/send.test.js
index 70a6031aa..ffe97670f 100644
--- a/ui/pages/send/send.test.js
+++ b/ui/pages/send/send.test.js
@@ -10,7 +10,7 @@ import {
   setBackgroundConnection,
 } from '../../../test/jest';
 import { GasEstimateTypes } from '../../../shared/constants/gas';
-import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../shared/constants/keyring';
 import { INITIAL_SEND_STATE_FOR_EXISTING_DRAFT } from '../../../test/jest/mocks';
 import Send from './send';
 
@@ -81,7 +81,7 @@ const baseStore = {
     selectedAddress: '0x0',
     keyrings: [
       {
-        type: HardwareKeyringTypes.hdKeyTree,
+        type: KeyringType.hdKeyTree,
         accounts: ['0x0'],
       },
     ],
diff --git a/ui/pages/token-allowance/token-allowance.test.js b/ui/pages/token-allowance/token-allowance.test.js
index 1601d76a7..a438caabb 100644
--- a/ui/pages/token-allowance/token-allowance.test.js
+++ b/ui/pages/token-allowance/token-allowance.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { fireEvent } from '@testing-library/react';
 import { renderWithProvider } from '../../../test/lib/render-helpers';
-import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../shared/constants/keyring';
 import TokenAllowance from './token-allowance';
 
 const testTokenAddress = '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F';
@@ -65,10 +65,10 @@ const state = {
       },
     ],
     unapprovedTxs: {},
-    keyringTypes: [HardwareKeyringTypes.ledger],
+    keyringTypes: [KeyringType.ledger],
     keyrings: [
       {
-        type: HardwareKeyringTypes.ledger,
+        type: KeyringType.ledger,
         accounts: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
       },
     ],
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 467a3d357..4fc7ba948 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -26,11 +26,11 @@ import {
   NETWORK_TYPES,
 } from '../../shared/constants/network';
 import {
-  HardwareKeyringTypes,
   WebHIDConnectedStatuses,
   LedgerTransportTypes,
   HardwareTransportStates,
 } from '../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../shared/constants/keyring';
 import { MESSAGE_TYPE } from '../../shared/constants/app';
 
 import { TRUNCATED_NAME_CHAR_LIMIT } from '../../shared/constants/labels';
@@ -127,7 +127,7 @@ export function hasUnsignedQRHardwareTransaction(state) {
   }
   const { from } = txParams;
   const { keyrings } = state.metamask;
-  const qrKeyring = keyrings.find((kr) => kr.type === HardwareKeyringTypes.qr);
+  const qrKeyring = keyrings.find((kr) => kr.type === KeyringType.qr);
   if (!qrKeyring) {
     return false;
   }
@@ -145,7 +145,7 @@ export function hasUnsignedQRHardwareMessage(state) {
   }
   const { from } = msgParams;
   const { keyrings } = state.metamask;
-  const qrKeyring = keyrings.find((kr) => kr.type === HardwareKeyringTypes.qr);
+  const qrKeyring = keyrings.find((kr) => kr.type === KeyringType.qr);
   if (!qrKeyring) {
     return false;
   }
@@ -232,11 +232,11 @@ export function getAccountType(state) {
   const type = currentKeyring && currentKeyring.type;
 
   switch (type) {
-    case HardwareKeyringTypes.trezor:
-    case HardwareKeyringTypes.ledger:
-    case HardwareKeyringTypes.lattice:
+    case KeyringType.trezor:
+    case KeyringType.ledger:
+    case KeyringType.lattice:
       return 'hardware';
-    case HardwareKeyringTypes.imported:
+    case KeyringType.imported:
       return 'imported';
     default:
       return 'default';
@@ -934,8 +934,7 @@ export const getUnreadNotificationsCount = createSelector(
  */
 function getAllowedAnnouncementIds(state) {
   const currentKeyring = getCurrentKeyring(state);
-  const currentKeyringIsLedger =
-    currentKeyring?.type === HardwareKeyringTypes.ledger;
+  const currentKeyringIsLedger = currentKeyring?.type === KeyringType.ledger;
   const supportsWebHid = window.navigator.hid !== undefined;
   const currentlyUsingLedgerLive =
     getLedgerTransportType(state) === LedgerTransportTypes.live;
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index ffa5311ad..f3593f937 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -1,5 +1,5 @@
 import mockState from '../../test/data/mock-state.json';
-import { HardwareKeyringTypes } from '../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../shared/constants/keyring';
 import * as selectors from './selectors';
 
 describe('Selectors', () => {
@@ -105,38 +105,38 @@ describe('Selectors', () => {
 
   describe('#isHardwareWallet', () => {
     it('returns false if it is not a HW wallet', () => {
-      mockState.metamask.keyrings[0].type = HardwareKeyringTypes.imported;
+      mockState.metamask.keyrings[0].type = KeyringType.imported;
       expect(selectors.isHardwareWallet(mockState)).toBe(false);
     });
 
     it('returns true if it is a Ledger HW wallet', () => {
-      mockState.metamask.keyrings[0].type = HardwareKeyringTypes.ledger;
+      mockState.metamask.keyrings[0].type = KeyringType.ledger;
       expect(selectors.isHardwareWallet(mockState)).toBe(true);
     });
 
     it('returns true if it is a Trezor HW wallet', () => {
-      mockState.metamask.keyrings[0].type = HardwareKeyringTypes.trezor;
+      mockState.metamask.keyrings[0].type = KeyringType.trezor;
       expect(selectors.isHardwareWallet(mockState)).toBe(true);
     });
   });
 
   describe('#getHardwareWalletType', () => {
     it('returns undefined if it is not a HW wallet', () => {
-      mockState.metamask.keyrings[0].type = HardwareKeyringTypes.imported;
+      mockState.metamask.keyrings[0].type = KeyringType.imported;
       expect(selectors.getHardwareWalletType(mockState)).toBeUndefined();
     });
 
     it('returns "Ledger Hardware" if it is a Ledger HW wallet', () => {
-      mockState.metamask.keyrings[0].type = HardwareKeyringTypes.ledger;
+      mockState.metamask.keyrings[0].type = KeyringType.ledger;
       expect(selectors.getHardwareWalletType(mockState)).toBe(
-        HardwareKeyringTypes.ledger,
+        KeyringType.ledger,
       );
     });
 
     it('returns "Trezor Hardware" if it is a Trezor HW wallet', () => {
-      mockState.metamask.keyrings[0].type = HardwareKeyringTypes.trezor;
+      mockState.metamask.keyrings[0].type = KeyringType.trezor;
       expect(selectors.getHardwareWalletType(mockState)).toBe(
-        HardwareKeyringTypes.trezor,
+        KeyringType.trezor,
       );
     });
   });
@@ -174,7 +174,7 @@ describe('Selectors', () => {
           ...mockState.metamask,
           keyrings: [
             {
-              type: HardwareKeyringTypes.ledger,
+              type: KeyringType.ledger,
               accounts: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
             },
           ],

From 0847917df43c2401faa091b89964ff2eb1a51165 Mon Sep 17 00:00:00 2001
From: David Drazic <david@timechaser.org>
Date: Tue, 21 Mar 2023 16:52:13 +0100
Subject: [PATCH 036/129] [FLASK] Update UI related to MetaMask Snaps Platform
 trademark (#18172)

* Update UI related to MetaMask Snaps Platform trademark

* Remove redundant UI text according to new designs

* Fix lint errors

* Fix e2e test expectation

* Fix lint in test

* Fix e2e test expectation

* Fix some UI parts

* Update CSS for noSnaps message

* Add next design iteration

* Add minor fix

* Update locale message

* Fix learn more text size

* Refactor usage of design system components

---------

Co-authored-by: Erik Marks <rekmarks@protonmail.com>
---
 app/_locales/de/messages.json                 |  6 --
 app/_locales/el/messages.json                 |  6 --
 app/_locales/en/messages.json                 | 14 ++--
 app/_locales/es/messages.json                 |  6 --
 app/_locales/fr/messages.json                 |  6 --
 app/_locales/hi/messages.json                 |  6 --
 app/_locales/id/messages.json                 |  6 --
 app/_locales/ja/messages.json                 |  6 --
 app/_locales/ko/messages.json                 |  6 --
 app/_locales/pt/messages.json                 |  6 --
 app/_locales/ru/messages.json                 |  6 --
 app/_locales/tl/messages.json                 |  6 --
 app/_locales/tr/messages.json                 |  6 --
 app/_locales/vi/messages.json                 |  6 --
 app/_locales/zh_CN/messages.json              |  6 --
 test/e2e/snaps/test-snap-management.spec.js   |  7 +-
 .../settings/flask/snaps-list-tab/index.scss  |  8 ++
 .../flask/snaps-list-tab/snap-list-tab.js     | 80 ++++++++++++++-----
 18 files changed, 78 insertions(+), 115 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 3923e2b5e..5840f9916 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Auf Etherscan anzeigen"
   },
-  "expandExperience": {
-    "message": "Erweitern Sie Ihre Web3-Erfahrung"
-  },
   "expandView": {
     "message": "Ansicht erweitern"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Fehlerhafte Daten"
   },
-  "manageSnaps": {
-    "message": "Verwalten Sie Ihre installierten Snaps"
-  },
   "max": {
     "message": "Max."
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 19f736c5f..6abefcb9f 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Προβολή στην Etherscan"
   },
-  "expandExperience": {
-    "message": "Επεκτείνετε την εμπειρία σας στο web3 με τα Snap του MetaMask"
-  },
   "expandView": {
     "message": "Ανάπτυξη Προβολής"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Παραμορφωμένα δεδομένα"
   },
-  "manageSnaps": {
-    "message": "Διαχειριστείτε τα εγκατεστημένα Snap σας"
-  },
   "max": {
     "message": "Μέγ."
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 9d3aaeb94..cf38aa3a2 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1344,18 +1344,21 @@
   "etherscanViewOn": {
     "message": "View on Etherscan"
   },
-  "expandExperience": {
-    "message": "Expand your web3 experience with MetaMask Snaps"
-  },
   "expandView": {
     "message": "Expand view"
   },
   "experimental": {
     "message": "Experimental"
   },
+  "exploreMetaMaskSnaps": {
+    "message": "Explore MetaMask Snaps"
+  },
   "exportPrivateKey": {
     "message": "Export private key"
   },
+  "extendWalletWithSnaps": {
+    "message": "Extend the wallet experience."
+  },
   "externalExtension": {
     "message": "External extension"
   },
@@ -1997,9 +2000,6 @@
   "malformedData": {
     "message": "Malformed data"
   },
-  "manageSnaps": {
-    "message": "Manage your installed snaps"
-  },
   "max": {
     "message": "Max"
   },
@@ -2285,7 +2285,7 @@
     "message": "No NFTs yet"
   },
   "noSnaps": {
-    "message": "No Snaps installed"
+    "message": "You don't have any snaps installed."
   },
   "noThanksVariant2": {
     "message": "No, thanks."
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 94b2d78da..441bc9198 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Ver en Etherscan"
   },
-  "expandExperience": {
-    "message": "Amplíe su experiencia web3 con complementos de MetaMask"
-  },
   "expandView": {
     "message": "Expandir vista"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Datos con formato incorrecto"
   },
-  "manageSnaps": {
-    "message": "Administre sus complementos instalados"
-  },
   "max": {
     "message": "Máx."
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 34849859e..18ac12f3c 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Afficher sur Etherscan"
   },
-  "expandExperience": {
-    "message": "Développez votre expérience web3 avec les Snaps MetaMask"
-  },
   "expandView": {
     "message": "Agrandir la vue"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Données malformées"
   },
-  "manageSnaps": {
-    "message": "Gérez vos Snaps installés"
-  },
   "max": {
     "message": "Max."
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index b57d88ae8..ff8eaa61e 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Etherscan पर देखें"
   },
-  "expandExperience": {
-    "message": "MetaMask स्नैप्स के साथ अपने web3 अनुभव का विस्तार करें"
-  },
   "expandView": {
     "message": "दृश्य का विस्तार करें"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "विकृत डेटा"
   },
-  "manageSnaps": {
-    "message": "अपने इंस्टाल किए गए स्नैप्स मैनेज करें"
-  },
   "max": {
     "message": "अधिकतम"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index a5c4bd5e2..51ce82d38 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Lihat di Etherscan"
   },
-  "expandExperience": {
-    "message": "Perluas pengalaman web3 Anda dengan MetaMask Snaps"
-  },
   "expandView": {
     "message": "Perluas tampilan"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Format data salah"
   },
-  "manageSnaps": {
-    "message": "Kelola Snap yang Anda instal"
-  },
   "max": {
     "message": "Maks"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 04461f0f6..945fbf1a7 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Etherscanで表示"
   },
-  "expandExperience": {
-    "message": "MetaMask Snaps で web3 エクスペリエンスを拡張"
-  },
   "expandView": {
     "message": "ビューを展開"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "不正な形式のデータ"
   },
-  "manageSnaps": {
-    "message": "インストールされたスナップの管理"
-  },
   "max": {
     "message": "最大"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index b321862ab..61c23b3ac 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Etherscan에서 보기"
   },
-  "expandExperience": {
-    "message": "MetaMask 스냅으로 web3 경험을 확대하세요"
-  },
   "expandView": {
     "message": "보기 확장"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "잘못된 데이터"
   },
-  "manageSnaps": {
-    "message": "설치된 스냅을 관리하세요"
-  },
   "max": {
     "message": "최대"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 86f69b1c0..f58d4221a 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Ver no Etherscan"
   },
-  "expandExperience": {
-    "message": "Expanda sua experiência web3 com os snaps da MetaMask"
-  },
   "expandView": {
     "message": "Expandir exibição"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Dados inválidos"
   },
-  "manageSnaps": {
-    "message": "Gerencie seus snaps instalados"
-  },
   "max": {
     "message": "Máximo"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index dd8db16a5..06f9a8f40 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Посмотреть на Etherscan"
   },
-  "expandExperience": {
-    "message": "Расширьте свои возможности web3 с помощью MetaMask Snaps"
-  },
   "expandView": {
     "message": "Развернуть представление"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Искаженные данные"
   },
-  "manageSnaps": {
-    "message": "Управляйте установленными снапами"
-  },
   "max": {
     "message": "Макс."
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index d7e0c937d..345c258cb 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Tingnan sa Etherscan"
   },
-  "expandExperience": {
-    "message": "Palawakin ang iyong karanasan sa web3 gamit ang MetaMask Snaps"
-  },
   "expandView": {
     "message": "I-expand ang view"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Pangit na datos"
   },
-  "manageSnaps": {
-    "message": "Pamahalaan ang iyong mga naka-install na snap"
-  },
   "max": {
     "message": "Max"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 5887a63d5..19cbbec96 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Etherscan'de görüntüle"
   },
-  "expandExperience": {
-    "message": "MetaMask Snap'leri ile web3 deneyimini genişlet"
-  },
   "expandView": {
     "message": "Görünümü genişlet"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Hatalı biçimlendirilmiş veri"
   },
-  "manageSnaps": {
-    "message": "Yüklü snap'lerini yönet"
-  },
   "max": {
     "message": "Maksimum"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 9a19d71b3..2f2035b36 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "Xem trên Etherscan"
   },
-  "expandExperience": {
-    "message": "Mở rộng trải nghiệm web3 của bạn với MetaMask Snap"
-  },
   "expandView": {
     "message": "Mở rộng cửa sổ xem"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "Dữ liệu không đúng định dạng"
   },
-  "manageSnaps": {
-    "message": "Quản lý các Snap đã cài đặt"
-  },
   "max": {
     "message": "Tối đa"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 49b04ecd2..3fed40c8c 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -1320,9 +1320,6 @@
   "etherscanViewOn": {
     "message": "在 Etherscan 上查看"
   },
-  "expandExperience": {
-    "message": "扩展MetaMask Snap的web3体验"
-  },
   "expandView": {
     "message": "展开视图"
   },
@@ -1955,9 +1952,6 @@
   "malformedData": {
     "message": "格式错误的数据"
   },
-  "manageSnaps": {
-    "message": "管理已安装的Snap"
-  },
   "max": {
     "message": "最大"
   },
diff --git a/test/e2e/snaps/test-snap-management.spec.js b/test/e2e/snaps/test-snap-management.spec.js
index b8eab6b0b..cb44e7d57 100644
--- a/test/e2e/snaps/test-snap-management.spec.js
+++ b/test/e2e/snaps/test-snap-management.spec.js
@@ -145,9 +145,12 @@ describe('Test Snap Management', function () {
         // check the results of the removal
         await driver.delay(2000);
         const removeResult = await driver.findElement(
-          '.snap-list-tab__container--no-snaps',
+          '.snap-list-tab__container--no-snaps_inner',
+        );
+        assert.equal(
+          await removeResult.getText(),
+          "You don't have any snaps installed.",
         );
-        assert.equal(await removeResult.getText(), 'No Snaps installed');
       },
     );
   });
diff --git a/ui/pages/settings/flask/snaps-list-tab/index.scss b/ui/pages/settings/flask/snaps-list-tab/index.scss
index 927849aec..abf10efd2 100644
--- a/ui/pages/settings/flask/snaps-list-tab/index.scss
+++ b/ui/pages/settings/flask/snaps-list-tab/index.scss
@@ -18,4 +18,12 @@
     margin: 8px 0;
     max-width: 344px;
   }
+
+  .snap-list-tab__container--no-snaps_inner {
+    max-width: 164px;
+  }
+
+  .snap-list-tab__no-snaps_icon {
+    font-size: 48px;
+  }
 }
diff --git a/ui/pages/settings/flask/snaps-list-tab/snap-list-tab.js b/ui/pages/settings/flask/snaps-list-tab/snap-list-tab.js
index ae3aa2918..c920985e4 100644
--- a/ui/pages/settings/flask/snaps-list-tab/snap-list-tab.js
+++ b/ui/pages/settings/flask/snaps-list-tab/snap-list-tab.js
@@ -3,19 +3,28 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import SnapSettingsCard from '../../../../components/app/flask/snap-settings-card';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import Typography from '../../../../components/ui/typography/typography';
 import {
-  TypographyVariant,
-  FLEX_DIRECTION,
   JustifyContent,
   AlignItems,
-  TextColor,
+  Color,
+  TEXT_ALIGN,
+  FLEX_DIRECTION,
+  Size,
 } from '../../../../helpers/constants/design-system';
 import Box from '../../../../components/ui/box';
 import { SNAPS_VIEW_ROUTE } from '../../../../helpers/constants/routes';
 import { disableSnap, enableSnap } from '../../../../store/actions';
 import { getSnaps } from '../../../../selectors';
 import { handleSettingsRefs } from '../../../../helpers/utils/settings-search';
+import {
+  BannerTip,
+  BannerTipLogoType,
+  ButtonLink,
+  Icon,
+  ICON_NAMES,
+  ICON_SIZES,
+  Text,
+} from '../../../../components/component-library';
 
 const SnapListTab = () => {
   const t = useI18nContext();
@@ -42,18 +51,6 @@ const SnapListTab = () => {
     <div className="snap-list-tab" ref={settingsRef}>
       {Object.entries(snaps).length ? (
         <div className="snap-list-tab__body">
-          <Box display="flex" flexDirection={FLEX_DIRECTION.COLUMN}>
-            <Typography variant={TypographyVariant.H5} marginBottom={2}>
-              {t('expandExperience')}
-            </Typography>
-            <Typography
-              variant={TypographyVariant.H6}
-              color={TextColor.textAlternative}
-              marginBottom={2}
-            >
-              {t('manageSnaps')}
-            </Typography>
-          </Box>
           <div className="snap-list-tab__wrapper">
             {Object.entries(snaps).map(([key, snap]) => {
               return (
@@ -82,15 +79,54 @@ const SnapListTab = () => {
           className="snap-list-tab__container--no-snaps"
           width="full"
           height="full"
-          justifyContent={JustifyContent.center}
           alignItems={AlignItems.center}
+          flexDirection={FLEX_DIRECTION.COLUMN}
         >
-          <Typography
-            variant={TypographyVariant.H4}
-            color={TextColor.textAlternative}
+          <Box
+            className="snap-list-tab__container--no-snaps_inner"
+            width="full"
+            height="full"
+            flexDirection={FLEX_DIRECTION.COLUMN}
+            justifyContent={JustifyContent.center}
+            alignItems={AlignItems.center}
           >
-            <span>{t('noSnaps')}</span>
-          </Typography>
+            <Icon
+              name={ICON_NAMES.SNAPS}
+              color={Color.iconMuted}
+              className="snap-list-tab__no-snaps_icon"
+              size={ICON_SIZES.AUTO}
+            />
+            <Text
+              color={Color.textMuted}
+              align={TEXT_ALIGN.CENTER}
+              marginTop={4}
+            >
+              {t('noSnaps')}
+            </Text>
+          </Box>
+          <Box
+            className="snap-list-tab__container--no-snaps_banner-tip"
+            width="full"
+            justifyContent={JustifyContent.center}
+            alignItems={AlignItems.flexEnd}
+            paddingLeft={4}
+            paddingRight={4}
+            paddingBottom={4}
+          >
+            <BannerTip
+              logoType={BannerTipLogoType.Greeting}
+              title={t('exploreMetaMaskSnaps')}
+              description={t('extendWalletWithSnaps')}
+            >
+              <ButtonLink
+                size={Size.auto}
+                href="https://metamask.io/snaps/"
+                target="_blank"
+              >
+                {`${t('learnMoreUpperCase')}`}
+              </ButtonLink>
+            </BannerTip>
+          </Box>
         </Box>
       )}
     </div>

From a04fa20f96a09461abfcb9a3b8b4db1f20cca2b8 Mon Sep 17 00:00:00 2001
From: Victorien Gauch <85494462+VGau@users.noreply.github.com>
Date: Tue, 21 Mar 2023 17:28:38 +0100
Subject: [PATCH 037/129] feat: add the ConsenSys zkEVM (Linea) as a default
 network (#17875)

* feat: add the consensys zkEVM as a default network

* fix: change infuraNetworkStatus in navigate-txs file

* fix: remove account tracker for zkEVM + remove zkEVM from infura list

* fix: change consensys zkevm name to linea + change rpc url for linea network

* fix: rebase conflicts

* feat: add new colors for linea goerli network

* feat: add new function inside network dropdown to render non infura networks

* feat: add feature toggle for linea network

* fix: add new unit test

---------

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 app/_locales/am/messages.json                 |  6 ++
 app/_locales/ar/messages.json                 |  6 ++
 app/_locales/bg/messages.json                 |  6 ++
 app/_locales/ca/messages.json                 |  6 ++
 app/_locales/da/messages.json                 |  6 ++
 app/_locales/de/messages.json                 |  6 ++
 app/_locales/el/messages.json                 |  6 ++
 app/_locales/en/messages.json                 |  6 ++
 app/_locales/es/messages.json                 |  6 ++
 app/_locales/es_419/messages.json             |  6 ++
 app/_locales/et/messages.json                 |  6 ++
 app/_locales/fa/messages.json                 |  6 ++
 app/_locales/fi/messages.json                 |  6 ++
 app/_locales/fil/messages.json                |  3 +
 app/_locales/fr/messages.json                 |  6 ++
 app/_locales/he/messages.json                 |  6 ++
 app/_locales/hi/messages.json                 |  6 ++
 app/_locales/hr/messages.json                 |  6 ++
 app/_locales/hu/messages.json                 |  6 ++
 app/_locales/id/messages.json                 |  6 ++
 app/_locales/it/messages.json                 |  6 ++
 app/_locales/ja/messages.json                 |  6 ++
 app/_locales/kn/messages.json                 |  6 ++
 app/_locales/ko/messages.json                 |  6 ++
 app/_locales/lt/messages.json                 |  6 ++
 app/_locales/lv/messages.json                 |  6 ++
 app/_locales/ms/messages.json                 |  6 ++
 app/_locales/no/messages.json                 |  3 +
 app/_locales/ph/messages.json                 |  6 ++
 app/_locales/pl/messages.json                 |  6 ++
 app/_locales/pt/messages.json                 |  6 ++
 app/_locales/pt_BR/messages.json              |  6 ++
 app/_locales/ro/messages.json                 |  6 ++
 app/_locales/ru/messages.json                 |  6 ++
 app/_locales/sk/messages.json                 |  6 ++
 app/_locales/sl/messages.json                 |  6 ++
 app/_locales/sr/messages.json                 |  6 ++
 app/_locales/sv/messages.json                 |  6 ++
 app/_locales/sw/messages.json                 |  6 ++
 app/_locales/tl/messages.json                 |  6 ++
 app/_locales/tr/messages.json                 |  6 ++
 app/_locales/uk/messages.json                 |  6 ++
 app/_locales/vi/messages.json                 |  6 ++
 app/_locales/zh_CN/messages.json              |  6 ++
 app/_locales/zh_TW/messages.json              |  6 ++
 .../handlers/switch-ethereum-chain.js         |  3 +-
 development/states/navigate-txs.json          |  3 +-
 shared/constants/network.ts                   | 32 ++++++
 .../app/dropdowns/network-dropdown.js         | 98 ++++++++++++++++++-
 .../app/dropdowns/network-dropdown.test.js    | 19 +++-
 .../loading-network-screen.component.js       |  2 +
 .../signature-request-original.component.js   |  2 +
 .../signature-request.component.js            |  2 +
 ui/components/ui/typography/typography.js     |  2 +
 ui/css/design-system/colors.scss              |  2 +
 ui/css/itcss/components/network.scss          |  4 +
 ui/css/utilities/colors.scss                  |  2 +
 ui/helpers/constants/design-system.ts         |  8 ++
 ui/helpers/constants/settings.js              |  7 ++
 ui/helpers/utils/settings-search.test.js      |  2 +-
 ui/helpers/utils/util.js                      |  1 +
 ui/helpers/utils/util.test.js                 | 11 +++
 ui/pages/routes/routes.component.js           |  2 +
 .../networks-tab/networks-tab.constants.js    | 10 ++
 .../settings/networks-tab/networks-tab.js     | 17 +++-
 65 files changed, 480 insertions(+), 13 deletions(-)

diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index d6b92d26f..1d11f9a35 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -157,6 +157,9 @@
   "connectingToGoerli": {
     "message": "ከ Goerli የሙከራ አውታረ መረብ ጋር መገናኘት"
   },
+  "connectingToLineaTestnet": {
+    "message": "ከ Linea Goerli የሙከራ አውታረ መረብ ጋር መገናኘት"
+  },
   "connectingToMainnet": {
     "message": "ከዋናው የ Ethereum አውታረ መረብ ጋር መገናኘት"
   },
@@ -400,6 +403,9 @@
   "likeToImportTokens": {
     "message": "እነዚህን ተለዋጭ ስሞች ለማከል ይፈልጋሉ?"
   },
+  "lineatestnet": {
+    "message": "የ Linea Goerli የሙከራ አውታረ መረብ"
+  },
   "links": {
     "message": "ማስፈንጠሪያዎች"
   },
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index 4fcdad960..aac31f246 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -167,6 +167,9 @@
   "connectingToGoerli": {
     "message": "الاتصال بشبكة اختبار Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "الاتصال بشبكة اختبار Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "جارِ الاتصال بشبكة إيثيريوم الرئيسية"
   },
@@ -412,6 +415,9 @@
   "likeToImportTokens": {
     "message": "هل ترغب في إضافة هذه الرموز؟"
   },
+  "lineatestnet": {
+    "message": "شبكة اختبار Linea Goerli"
+  },
   "links": {
     "message": "الروابط"
   },
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index dcd599431..eea674ea6 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Свързване с тестова мрежа на Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Свързване с тестова мрежа на Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Свързване с главната мрежа Ethereum"
   },
@@ -408,6 +411,9 @@
   "likeToImportTokens": {
     "message": "Искате ли да добавите тези жетони?"
   },
+  "lineatestnet": {
+    "message": "Тестова мрежа на Linea Goerli"
+  },
   "links": {
     "message": "Връзки"
   },
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index 14c6c1a62..c382f3619 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -160,6 +160,9 @@
   "connectingToGoerli": {
     "message": "Connectant a Xarxa de Prova Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Connectant a Xarxa de Prova Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Connectant a Xarxa Principal Ethereum"
   },
@@ -399,6 +402,9 @@
   "likeToImportTokens": {
     "message": "T'agradaria afegir aquestes fitxes?"
   },
+  "lineatestnet": {
+    "message": "Xarxa de test Linea Goerli"
+  },
   "links": {
     "message": "Enllaços"
   },
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index 8826e1263..68974f4e7 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Opretter forbindelse til Goerli Testnetværk"
   },
+  "connectingToLineaTestnet": {
+    "message": "Opretter forbindelse til Linea Goerli Testnetværk"
+  },
   "connectingToMainnet": {
     "message": "Forbinder til dit Primære Ethereum Netværk"
   },
@@ -405,6 +408,9 @@
   "likeToImportTokens": {
     "message": "Ønsker du at tilføje disse tokens?"
   },
+  "lineatestnet": {
+    "message": "Linea-testnetværk"
+  },
   "loadMore": {
     "message": "Indlæs Mere"
   },
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 5840f9916..a92a7de6a 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Verbindungsaufbau zum Goerli-Testnetzwerk"
   },
+  "connectingToLineaTestnet": {
+    "message": "Verbindungsaufbau zum Linea-Testnetzwerk"
+  },
   "connectingToMainnet": {
     "message": "Verbinde zum Ethereum Mainnet"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "Möchtest du diese Token hinzufügen?"
   },
+  "lineatestnet": {
+    "message": "Linea-Testnetzwerk"
+  },
   "link": {
     "message": "Link"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 6abefcb9f..bb17e4e33 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Σύνδεση στο Δίκτυο Δοκιμής Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Σύνδεση στο δίκτυο δοκιμών Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Σύνδεση στο Κύριο Δίκτυο Ethereum"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "Θέλετε να προσθέσετε αυτά τα token;"
   },
+  "lineatestnet": {
+    "message": "Δίκτυο δοκιμών Linea Goerli"
+  },
   "link": {
     "message": "Σύνδεσμος"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index cf38aa3a2..1dfc9ec31 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -732,6 +732,9 @@
   "connectingToGoerli": {
     "message": "Connecting to Goerli test network"
   },
+  "connectingToLineaTestnet": {
+    "message": "Connecting to Linea Goerli test network"
+  },
   "connectingToMainnet": {
     "message": "Connecting to Ethereum Mainnet"
   },
@@ -1940,6 +1943,9 @@
   "likeToImportTokens": {
     "message": "Would you like to import these tokens?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli test network"
+  },
   "link": {
     "message": "Link"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 441bc9198..e987868a4 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Estableciendo conexión a la red de prueba Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Conectando a la red de prueba Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Estableciendo conexión a la red principal de Ethereum"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "¿Le gustaría agregar estos tokens?"
   },
+  "lineatestnet": {
+    "message": "Red de prueba Linea Goerli"
+  },
   "link": {
     "message": "Vínculo"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 2a4ffbb8e..5e90a0c91 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -451,6 +451,9 @@
   "connectingToGoerli": {
     "message": "Estableciendo conexión a la red de prueba Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Estableciendo conexión a la red de prueba Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Estableciendo conexión a la red principal de Ethereum"
   },
@@ -1269,6 +1272,9 @@
   "likeToImportTokens": {
     "message": "¿Quiere agregar estos tokens?"
   },
+  "lineatestnet": {
+    "message": "Red de prueba Linea Goerli"
+  },
   "link": {
     "message": "Enlace"
   },
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index 59aefc86c..1efe138a8 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Ühendamine Goerli testvõrguga"
   },
+  "connectingToLineaTestnet": {
+    "message": "Ühendamine Linea Goerli testvõrguga"
+  },
   "connectingToMainnet": {
     "message": "Ühenduse loomine peamise Etherumi võrguga"
   },
@@ -408,6 +411,9 @@
   "likeToImportTokens": {
     "message": "Kas soovite need load lisada?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli testvõrk"
+  },
   "links": {
     "message": "Lingid"
   },
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index 9603c04f3..ccf627d31 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "در حال اتصال به شبکه آزمایشی Goerli "
   },
+  "connectingToLineaTestnet": {
+    "message": "در حال اتصال به شبکه آزمایشی Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "در حال اتصال به شبکه اصلی ایتریم"
   },
@@ -412,6 +415,9 @@
   "likeToImportTokens": {
     "message": "آیا میخواهید این رمزیاب ها را اضافه نمایید؟"
   },
+  "lineatestnet": {
+    "message": "شبکه آزمایشی Linea Goerli"
+  },
   "links": {
     "message": "لینک ها"
   },
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index 2ba49aee4..b43b0bc46 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Yhdistetään Goerlin testiverkostoon"
   },
+  "connectingToLineaTestnet": {
+    "message": "Yhdistetään Linea Goerli testiverkostoon"
+  },
   "connectingToMainnet": {
     "message": "Yhdistetään Ethereumin pääverkkoon"
   },
@@ -412,6 +415,9 @@
   "likeToImportTokens": {
     "message": "Haluaisitko lisätä nämä poletit?"
   },
+  "lineatestnet": {
+    "message": "Linea-testiverkko"
+  },
   "links": {
     "message": "Linkit"
   },
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index a8262f9ae..158a9b6dc 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -142,6 +142,9 @@
   "connectingToGoerli": {
     "message": "Kumokonekta sa Goerli Test Network"
   },
+  "connectingToLineaTestnet": {
+    "message": "Kumokonekta sa Linea Goerli Test Network"
+  },
   "connectingToMainnet": {
     "message": "Kumokonekta sa Ethereum Mainnet"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 18ac12f3c..e2f21611a 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Connexion au testnet Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Connexion au réseau de test Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Connexion au réseau principal Ethereum"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "Souhaitez-vous ajouter ces jetons ?"
   },
+  "lineatestnet": {
+    "message": "Réseau de test Linea Goerli"
+  },
   "link": {
     "message": "Associer"
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index 646efc5b6..ac0251010 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "מתחבר ל-Goerli Test Network"
   },
+  "connectingToLineaTestnet": {
+    "message": "מתחבר ל-Linea Goerli Test Network"
+  },
   "connectingToMainnet": {
     "message": "מתחבר לרשת אתריום הראשית"
   },
@@ -412,6 +415,9 @@
   "likeToImportTokens": {
     "message": "האם ברצונך להוסיף טוקנים אלה?"
   },
+  "lineatestnet": {
+    "message": "רשת בדיקה Linea Goerli"
+  },
   "links": {
     "message": "קישורים"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index ff8eaa61e..2c2da2a6e 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Goerli टेस्ट नेटवर्क से कनेक्ट हो रहा है"
   },
+  "connectingToLineaTestnet": {
+    "message": "Linea Goerli टेस्ट नेटवर्क से कनेक्ट हो रहा है"
+  },
   "connectingToMainnet": {
     "message": "Ethereum Mainnet से कनेक्ट हो रहा है"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "क्या आप इन टोकन को इंपोर्ट करना चाहते हैं?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli टेस्ट नेटवर्क"
+  },
   "link": {
     "message": "लिंक"
   },
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index 9aed6392c..decdfbb9c 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Povezivanje na testnu mrežu Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Povezivanje na testnu mrežu Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Povezivanje na glavnu mrežu Ethereum"
   },
@@ -408,6 +411,9 @@
   "likeToImportTokens": {
     "message": "Želite li dodati ove tokene?"
   },
+  "lineatestnet": {
+    "message": "Testna mreža Linea Goerli"
+  },
   "links": {
     "message": "Poveznice"
   },
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 7a48cf68a..340e7e7c1 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Csatlakozás a Goerli teszthálózathoz"
   },
+  "connectingToLineaTestnet": {
+    "message": "Csatlakozás a Linea Goerli teszthálózathoz"
+  },
   "connectingToMainnet": {
     "message": "Csatlakozás a fő Ethereum hálózathoz"
   },
@@ -408,6 +411,9 @@
   "likeToImportTokens": {
     "message": "Hozzá szeretné adni ezeket az érméket?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli teszthálózat"
+  },
   "links": {
     "message": "Linkek"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 51ce82d38..370ffdf72 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Menghubungkan ke jaringan uji Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Menghubungkan ke jaringan uji Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Menghubungkan ke Ethereum Mainnet"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "Apakah Anda ingin menambahkan token ini?"
   },
+  "lineatestnet": {
+    "message": "Jaringan uji Linea Goerli"
+  },
   "link": {
     "message": "Tautan"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 4e5fe8a4a..8e6e39683 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -551,6 +551,9 @@
   "connectingToGoerli": {
     "message": "Connessione alla Rete di Test Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Connessione alla Rete di test Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Connessione alla Rete Ethereum Principale"
   },
@@ -1125,6 +1128,9 @@
   "likeToImportTokens": {
     "message": "Vorresti aggiungere questi token?"
   },
+  "lineatestnet": {
+    "message": "Rete di test Linea Goerli"
+  },
   "links": {
     "message": "Collegamenti"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 945fbf1a7..57d53796f 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Goerliテストネットワークに接続中"
   },
+  "connectingToLineaTestnet": {
+    "message": "Linea Goerli テストネットワークに接続中"
+  },
   "connectingToMainnet": {
     "message": "イーサリアムメインネットに接続中"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "これらのトークンを追加しますか?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli テストネットワーク"
+  },
   "link": {
     "message": "リンク"
   },
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index 42de7215f..b1ab67888 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Goerli ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ"
   },
+  "connectingToLineaTestnet": {
+    "message": "Linea Goerli ಪರೀಕ್ಷಾ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ"
+  },
   "connectingToMainnet": {
     "message": "ಮುಖ್ಯ ಎಥೆರಿಯಮ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ"
   },
@@ -412,6 +415,9 @@
   "likeToImportTokens": {
     "message": "ನೀವು ಈ ಟೋಕನ್‌ಗಳನ್ನು ಸೇರಿಸಲು ಬಯಸುತ್ತೀರಾ?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli ಪರೀಕ್ಷೆ ನೆಟ್‌ವರ್ಕ್"
+  },
   "links": {
     "message": "ಲಿಂಕ್‌ಗಳು"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 61c23b3ac..2826089ef 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Goerli 테스트 네트워크에 연결 중"
   },
+  "connectingToLineaTestnet": {
+    "message": "Linea Goerli 테스트 네트워크에 연결 중"
+  },
   "connectingToMainnet": {
     "message": "이더리움 메인넷에 연결 중"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "이 토큰을 추가할까요?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli 테스트 네트워크"
+  },
   "link": {
     "message": "링크"
   },
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index f703eb3b5..d39141fac 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Jungiamasi prie „Goerli“ bandomojo tinklo"
   },
+  "connectingToLineaTestnet": {
+    "message": "Jungiamasi prie „Linea“ bandomojo tinklo"
+  },
   "connectingToMainnet": {
     "message": "Jungiamasi prie pagrindinio „Ethereum“ tinklo"
   },
@@ -412,6 +415,9 @@
   "likeToImportTokens": {
     "message": "Ar norėtumėte pridėti šiuos žetonus?"
   },
+  "lineatestnet": {
+    "message": "„Linea“ bandomasis tinklas"
+  },
   "links": {
     "message": "Nuorodos"
   },
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index 46d4b0a7b..d174f8442 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Pieslēdzas Goerli testa tīklam"
   },
+  "connectingToLineaTestnet": {
+    "message": "Pieslēdzas Linea Goerli testa tīklam"
+  },
   "connectingToMainnet": {
     "message": "Savienojas ar galveno Ethereum tīklu"
   },
@@ -408,6 +411,9 @@
   "likeToImportTokens": {
     "message": "Vai vēlaties pievienot šos marķierus?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli testa tīkls"
+  },
   "links": {
     "message": "Saites"
   },
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index fbc374dbb..5dd5a8216 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Menyambung kepada Rangkaian Ujian Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Menyambung kepada Rangkaian Ujian Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Menyambung kepada Rangkaian Ethereum Utama"
   },
@@ -401,6 +404,9 @@
   "likeToImportTokens": {
     "message": "Adakah anda ingin menambah token ini?"
   },
+  "lineatestnet": {
+    "message": "Rangkaian Ujian Linea Goerli"
+  },
   "links": {
     "message": "Pautan"
   },
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index 8f9639b6e..5e904cf86 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -160,6 +160,9 @@
   "connectingToGoerli": {
     "message": "Oppretter forbindelse med Goerli Test Network"
   },
+  "connectingToLineaTestnet": {
+    "message": "Oppretter forbindelse med Linea Goerli Test Network"
+  },
   "connectingToMainnet": {
     "message": "Forbinder med hoved-Ethereumnettverk "
   },
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index 59e85e104..48f21c3c4 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -314,6 +314,9 @@
   "connectingToGoerli": {
     "message": "Kumokonekta sa Goerli Test Network"
   },
+  "connectingToLineaTestnet": {
+    "message": "Kumokonekta sa Linea Goerli Test Network"
+  },
   "connectingToMainnet": {
     "message": "Kumokonekta sa Ethereum Mainnet"
   },
@@ -804,6 +807,9 @@
   "likeToImportTokens": {
     "message": "Gusto mo bang idagdag ang mga token na ito?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli Test Network"
+  },
   "links": {
     "message": "Mga Link"
   },
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index aaf196fa7..531164a02 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Łączenie z siecią testową Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Łączenie z siecią testową Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Łączenie z główną siecią Ethereum"
   },
@@ -412,6 +415,9 @@
   "likeToImportTokens": {
     "message": "Czy chcesz dodać te tokeny?"
   },
+  "lineatestnet": {
+    "message": "Sieć testowa Linea Goerli"
+  },
   "links": {
     "message": "Łącza"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index f58d4221a..46fc9910f 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Conectando à rede de testes Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Conectando à rede de teste Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Conectando à mainnet do Ethereum"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "Gostaria de adicionar estes tokens?"
   },
+  "lineatestnet": {
+    "message": "Rede de teste Linea Goerli"
+  },
   "link": {
     "message": "Link"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index a2a6580cc..e051519b8 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -451,6 +451,9 @@
   "connectingToGoerli": {
     "message": "Conectando à rede de testes Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Conectando à rede de testes Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Conectando à mainnet do Ethereum"
   },
@@ -1269,6 +1272,9 @@
   "likeToImportTokens": {
     "message": "Você gostaria de importar esses tokens?"
   },
+  "lineatestnet": {
+    "message": "Rede de testes Linea Goerli"
+  },
   "link": {
     "message": "Link"
   },
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index 37e59a345..4fc356286 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Se conectează la rețeaua de test Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Se conectează la rețeaua de test Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Se conectează la rețeaua Ethereum principală"
   },
@@ -402,6 +405,9 @@
   "likeToImportTokens": {
     "message": "Adăugați aceste indicative?"
   },
+  "lineatestnet": {
+    "message": "Rețea de test Linea Goerli"
+  },
   "links": {
     "message": "Link-uri"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 06f9a8f40..d906e91fe 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Подключение к тестовой сети Goerli..."
   },
+  "connectingToLineaTestnet": {
+    "message": "Подключение к тестовой сети Linea..."
+  },
   "connectingToMainnet": {
     "message": "Подключение к сети Ethereum Mainnet..."
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "Вы хотели бы импортировать эти токены?"
   },
+  "lineatestnet": {
+    "message": "Тестовая сеть Linea Goerli"
+  },
   "link": {
     "message": "Привязать"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index b98b4022f..7ab10cf1e 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -157,6 +157,9 @@
   "connectingToGoerli": {
     "message": "Pripája sa k testovacej sieti Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Pripája sa k testovacej sieti Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Připojuji se k Ethereum Mainnet"
   },
@@ -399,6 +402,9 @@
   "likeToImportTokens": {
     "message": "Chcete přidat tyto tokeny?"
   },
+  "lineatestnet": {
+    "message": "Testovacia sieť Linea Goerli"
+  },
   "links": {
     "message": "Odkazy"
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index 247fc2eb3..2c774019e 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Povezovanje na testno omrežje Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Povezovanje na testno omrežje Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Povezovanje na glavno omrežje"
   },
@@ -406,6 +409,9 @@
   "likeToImportTokens": {
     "message": "Želite dodati te žetone?"
   },
+  "lineatestnet": {
+    "message": "Testno omrežje Linea Goerli"
+  },
   "links": {
     "message": "Povezave"
   },
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index 875be6323..c87c6972c 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -160,6 +160,9 @@
   "connectingToGoerli": {
     "message": "Povezuje se sa test mrežom Goerli "
   },
+  "connectingToLineaTestnet": {
+    "message": "Povezuje se sa test mrežom Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Povezuje se na glavnu Ethereum mrežu"
   },
@@ -409,6 +412,9 @@
   "likeToImportTokens": {
     "message": "Želite li da dodate ove tokene?"
   },
+  "lineatestnet": {
+    "message": "Test mreža Linea Goerli"
+  },
   "links": {
     "message": "Veze"
   },
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index 2b4eb8734..f8912daa6 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -157,6 +157,9 @@
   "connectingToGoerli": {
     "message": "Ansluter till Goerli Test Network"
   },
+  "connectingToLineaTestnet": {
+    "message": "Ansluter till Linea Goerli Test Network"
+  },
   "connectingToMainnet": {
     "message": "Koppla till Ethereums huvudnätverk"
   },
@@ -402,6 +405,9 @@
   "likeToImportTokens": {
     "message": "Vill du lägga till dessa tokens?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli testnätverk"
+  },
   "links": {
     "message": "Länkar"
   },
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index 161b59ee6..c50e6e0bc 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -157,6 +157,9 @@
   "connectingToGoerli": {
     "message": "Inaunganisha kwenye Mtandao wa Majaribio wa Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Inaunganisha kwenye Mtandao wa Majaribio wa Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Inaunganisha kwenye Mtandao Mkuu wa Ethereum"
   },
@@ -399,6 +402,9 @@
   "likeToImportTokens": {
     "message": "Je, ungependa kuongeza vianzio hivi?"
   },
+  "lineatestnet": {
+    "message": "Mtandao wa Majaribio wa Linea Goerli"
+  },
   "links": {
     "message": "Viungo"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 345c258cb..334c05393 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Kumokonekta sa Goerli Test Network"
   },
+  "connectingToLineaTestnet": {
+    "message": "Kumokonekta sa Linea Goerli test network"
+  },
   "connectingToMainnet": {
     "message": "Kumokonekta sa Ethereum Mainnet"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "Gusto mo bang idagdag ang mga token na ito?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli test network"
+  },
   "link": {
     "message": "Link"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 19cbbec96..3b85a7dc8 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Goerli Test Ağına Bağlanıyor"
   },
+  "connectingToLineaTestnet": {
+    "message": "Linea Goerli test ağına bağlanılıyor"
+  },
   "connectingToMainnet": {
     "message": "Ethereum Mainnet ağına bağlanıyor"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "Bu tokenleri içe aktarmak ister misiniz?"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli test ağı"
+  },
   "link": {
     "message": "Bağlantı"
   },
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index 6609fec2f..83f6857de 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -163,6 +163,9 @@
   "connectingToGoerli": {
     "message": "Підключення до тестової мережі Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Підключення до тестової мережі Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "З'єднуємось з Головною мережею Ethereum"
   },
@@ -412,6 +415,9 @@
   "likeToImportTokens": {
     "message": "Ви б хотіли додати ці токени?"
   },
+  "lineatestnet": {
+    "message": "Тестова мережа Linea Goerli"
+  },
   "links": {
     "message": "Посилання"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 2f2035b36..00897f945 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "Đang kết nối với mạng thử nghiệm Goerli"
   },
+  "connectingToLineaTestnet": {
+    "message": "Đang kết nối với mạng thử nghiệm Linea Goerli"
+  },
   "connectingToMainnet": {
     "message": "Đang kết nối với mạng chính thức của Ethereum"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "Bạn có muốn nhập những token này không?"
   },
+  "lineatestnet": {
+    "message": "Mạng thử nghiệm Linea Goerli"
+  },
   "link": {
     "message": "Liên kết"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 3fed40c8c..096dcd1e4 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -711,6 +711,9 @@
   "connectingToGoerli": {
     "message": "正在连接 Goerli 测试网络"
   },
+  "connectingToLineaTestnet": {
+    "message": "正在连接Linea测试网络"
+  },
   "connectingToMainnet": {
     "message": "正在连接到以太坊主网"
   },
@@ -1892,6 +1895,9 @@
   "likeToImportTokens": {
     "message": "您想导入这些代币吗？"
   },
+  "lineatestnet": {
+    "message": "Linea测试网络"
+  },
   "link": {
     "message": "链接"
   },
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 6fb45813b..ccb72664b 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -313,6 +313,9 @@
   "connectingToGoerli": {
     "message": "連線到 Goerli 測試網路"
   },
+  "connectingToLineaTestnet": {
+    "message": "連線到 Linea Goerli 測試網路"
+  },
   "connectingToMainnet": {
     "message": "連線到 Ethereum 主網路"
   },
@@ -812,6 +815,9 @@
   "likeToImportTokens": {
     "message": "確定要加入代幣？"
   },
+  "lineatestnet": {
+    "message": "Linea Goerli 測試網路"
+  },
   "links": {
     "message": "連結"
   },
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js b/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js
index 65ba5a2b1..935b9ec60 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js
@@ -110,7 +110,8 @@ async function switchEthereumChainHandler(
       });
       if (
         chainId in CHAIN_ID_TO_TYPE_MAP &&
-        approvedRequestData.type !== NETWORK_TYPES.LOCALHOST
+        approvedRequestData.type !== NETWORK_TYPES.LOCALHOST &&
+        approvedRequestData.type !== NETWORK_TYPES.LINEA_TESTNET
       ) {
         setProviderType(approvedRequestData.type);
       } else {
diff --git a/development/states/navigate-txs.json b/development/states/navigate-txs.json
index 68d2535a2..6a4605e9a 100644
--- a/development/states/navigate-txs.json
+++ b/development/states/navigate-txs.json
@@ -304,7 +304,8 @@
     "infuraNetworkStatus": {
       "mainnet": "ok",
       "goerli": "ok",
-      "sepolia": "ok"
+      "sepolia": "ok",
+      "lineatestnet": "ok"
     }
   },
   "send": {
diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 58ca0ce1c..16bafb208 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -95,6 +95,7 @@ export const NETWORK_TYPES = {
   MAINNET: 'mainnet',
   RPC: 'rpc',
   SEPOLIA: 'sepolia',
+  LINEA_TESTNET: 'lineatestnet',
 } as const;
 
 /**
@@ -120,6 +121,7 @@ export const NETWORK_IDS = {
   GOERLI: '5',
   LOCALHOST: '1337',
   SEPOLIA: '11155111',
+  LINEA_TESTNET: '59140',
 } as const;
 
 /**
@@ -145,6 +147,7 @@ export const CHAIN_IDS = {
   HARMONY: '0x63564c40',
   PALM: '0x2a15c308d',
   SEPOLIA: '0xaa36a7',
+  LINEA_TESTNET: '0xe704',
   AURORA: '0x4e454152',
   MOONBEAM: '0x504',
   MOONBEAM_TESTNET: '0x507',
@@ -160,6 +163,7 @@ export const MAX_SAFE_CHAIN_ID = 4503599627370476;
 export const MAINNET_DISPLAY_NAME = 'Ethereum Mainnet';
 export const GOERLI_DISPLAY_NAME = 'Goerli';
 export const SEPOLIA_DISPLAY_NAME = 'Sepolia';
+export const LINEA_TESTNET_DISPLAY_NAME = 'Linea Goerli test network';
 export const LOCALHOST_DISPLAY_NAME = 'Localhost 8545';
 export const BSC_DISPLAY_NAME = 'Binance Smart Chain';
 export const POLYGON_DISPLAY_NAME = 'Polygon';
@@ -189,6 +193,7 @@ export const MAINNET_RPC_URL = getRpcUrl({
 });
 export const GOERLI_RPC_URL = getRpcUrl({ network: NETWORK_TYPES.GOERLI });
 export const SEPOLIA_RPC_URL = getRpcUrl({ network: NETWORK_TYPES.SEPOLIA });
+export const LINEA_TESTNET_RPC_URL = 'https://rpc.goerli.linea.build';
 export const LOCALHOST_RPC_URL = 'http://localhost:8545';
 
 /**
@@ -238,6 +243,7 @@ export const INFURA_PROVIDER_TYPES = [
 export const TEST_CHAINS = [
   CHAIN_IDS.GOERLI,
   CHAIN_IDS.SEPOLIA,
+  CHAIN_IDS.LINEA_TESTNET,
   CHAIN_IDS.LOCALHOST,
 ];
 
@@ -256,6 +262,10 @@ export const TEST_NETWORK_TICKER_MAP: {
   [NETWORK_TYPES.SEPOLIA]: `${typedCapitalize(NETWORK_TYPES.SEPOLIA)}${
     CURRENCY_SYMBOLS.ETH
   }`,
+  [NETWORK_TYPES.LINEA_TESTNET]:
+    `Linea${CURRENCY_SYMBOLS.ETH}` as `${Capitalize<
+      typeof NETWORK_TYPES.LINEA_TESTNET
+    >}${typeof CURRENCY_SYMBOLS.ETH}`,
 };
 
 /**
@@ -274,6 +284,12 @@ export const BUILT_IN_NETWORKS = {
     ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
     blockExplorerUrl: `https://${NETWORK_TYPES.SEPOLIA}.etherscan.io`,
   },
+  [NETWORK_TYPES.LINEA_TESTNET]: {
+    networkId: NETWORK_IDS.LINEA_TESTNET,
+    chainId: CHAIN_IDS.LINEA_TESTNET,
+    ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_TESTNET],
+    blockExplorerUrl: 'https://explorer.goerli.linea.build',
+  },
   [NETWORK_TYPES.MAINNET]: {
     networkId: NETWORK_IDS.MAINNET,
     chainId: CHAIN_IDS.MAINNET,
@@ -289,15 +305,18 @@ export const NETWORK_TO_NAME_MAP = {
   [NETWORK_TYPES.MAINNET]: MAINNET_DISPLAY_NAME,
   [NETWORK_TYPES.GOERLI]: GOERLI_DISPLAY_NAME,
   [NETWORK_TYPES.SEPOLIA]: SEPOLIA_DISPLAY_NAME,
+  [NETWORK_TYPES.LINEA_TESTNET]: LINEA_TESTNET_DISPLAY_NAME,
   [NETWORK_TYPES.LOCALHOST]: LOCALHOST_DISPLAY_NAME,
 
   [NETWORK_IDS.GOERLI]: GOERLI_DISPLAY_NAME,
   [NETWORK_IDS.SEPOLIA]: SEPOLIA_DISPLAY_NAME,
+  [NETWORK_IDS.LINEA_TESTNET]: LINEA_TESTNET_DISPLAY_NAME,
   [NETWORK_IDS.MAINNET]: MAINNET_DISPLAY_NAME,
   [NETWORK_IDS.LOCALHOST]: LOCALHOST_DISPLAY_NAME,
 
   [CHAIN_IDS.GOERLI]: GOERLI_DISPLAY_NAME,
   [CHAIN_IDS.SEPOLIA]: SEPOLIA_DISPLAY_NAME,
+  [CHAIN_IDS.LINEA_TESTNET]: LINEA_TESTNET_DISPLAY_NAME,
   [CHAIN_IDS.MAINNET]: MAINNET_DISPLAY_NAME,
   [CHAIN_IDS.LOCALHOST]: LOCALHOST_DISPLAY_NAME,
 } as const;
@@ -306,12 +325,14 @@ export const CHAIN_ID_TO_TYPE_MAP = {
   [CHAIN_IDS.MAINNET]: NETWORK_TYPES.MAINNET,
   [CHAIN_IDS.GOERLI]: NETWORK_TYPES.GOERLI,
   [CHAIN_IDS.SEPOLIA]: NETWORK_TYPES.SEPOLIA,
+  [CHAIN_IDS.LINEA_TESTNET]: NETWORK_TYPES.LINEA_TESTNET,
   [CHAIN_IDS.LOCALHOST]: NETWORK_TYPES.LOCALHOST,
 } as const;
 
 export const CHAIN_ID_TO_RPC_URL_MAP = {
   [CHAIN_IDS.GOERLI]: GOERLI_RPC_URL,
   [CHAIN_IDS.SEPOLIA]: SEPOLIA_RPC_URL,
+  [CHAIN_IDS.LINEA_TESTNET]: LINEA_TESTNET_RPC_URL,
   [CHAIN_IDS.MAINNET]: MAINNET_RPC_URL,
   [CHAIN_IDS.LOCALHOST]: LOCALHOST_RPC_URL,
 } as const;
@@ -333,6 +354,7 @@ export const CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP = {
 export const NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP = {
   [NETWORK_IDS.GOERLI]: NETWORK_TYPES.GOERLI,
   [NETWORK_IDS.SEPOLIA]: NETWORK_TYPES.SEPOLIA,
+  [NETWORK_IDS.LINEA_TESTNET]: NETWORK_TYPES.LINEA_TESTNET,
   [NETWORK_IDS.MAINNET]: NETWORK_NAMES.HOMESTEAD,
 } as const;
 
@@ -340,6 +362,7 @@ export const CHAIN_ID_TO_NETWORK_ID_MAP = {
   [CHAIN_IDS.MAINNET]: NETWORK_IDS.MAINNET,
   [CHAIN_IDS.GOERLI]: NETWORK_IDS.GOERLI,
   [CHAIN_IDS.SEPOLIA]: NETWORK_IDS.SEPOLIA,
+  [CHAIN_IDS.LINEA_TESTNET]: NETWORK_IDS.LINEA_TESTNET,
   [CHAIN_IDS.LOCALHOST]: NETWORK_IDS.LOCALHOST,
 } as const;
 
@@ -380,6 +403,11 @@ export const ETHERSCAN_SUPPORTED_NETWORKS = {
     }`,
     networkId: CHAIN_ID_TO_NETWORK_ID_MAP[CHAIN_IDS.SEPOLIA],
   },
+  [CHAIN_IDS.LINEA_TESTNET]: {
+    domain: 'linea.build',
+    subdomain: 'explorer.goerli',
+    networkId: CHAIN_ID_TO_NETWORK_ID_MAP[CHAIN_IDS.LINEA_TESTNET],
+  },
   [CHAIN_IDS.BSC]: {
     domain: 'bscscan.com',
     subdomain: defaultEtherscanSubdomainPrefix,
@@ -504,6 +532,7 @@ export const BUYABLE_CHAINS_MAP: {
     | typeof CHAIN_IDS.MOONBEAM_TESTNET
     | typeof CHAIN_IDS.MOONRIVER
     | typeof CHAIN_IDS.AURORA
+    | typeof CHAIN_IDS.LINEA_TESTNET
   >]: BuyableChainSettings;
 } = {
   [CHAIN_IDS.MAINNET]: {
@@ -650,3 +679,6 @@ export const FEATURED_RPCS: RPCDefinition[] = [
     },
   },
 ];
+
+export const SHOULD_SHOW_LINEA_TESTNET_NETWORK =
+  new Date().getTime() > Date.UTC(2023, 2, 28);
diff --git a/ui/components/app/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js
index f8c7e6e97..09e94c498 100644
--- a/ui/components/app/dropdowns/network-dropdown.js
+++ b/ui/components/app/dropdowns/network-dropdown.js
@@ -8,8 +8,13 @@ import Button from '../../ui/button';
 import * as actions from '../../../store/actions';
 import { openAlert as displayInvalidCustomNetworkAlert } from '../../../ducks/alerts/invalid-custom-network';
 import {
+  BUILT_IN_NETWORKS,
+  CHAIN_ID_TO_RPC_URL_MAP,
+  LINEA_TESTNET_RPC_URL,
   LOCALHOST_RPC_URL,
+  NETWORK_TO_NAME_MAP,
   NETWORK_TYPES,
+  SHOULD_SHOW_LINEA_TESTNET_NETWORK,
 } from '../../../../shared/constants/network';
 import { isPrefixedFormattedHexString } from '../../../../shared/modules/network.utils';
 
@@ -65,6 +70,8 @@ function mapDispatchToProps(dispatch) {
     setActiveNetwork: (networkConfigurationId) => {
       dispatch(actions.setActiveNetwork(networkConfigurationId));
     },
+    upsertNetworkConfiguration: (...args) =>
+      dispatch(actions.upsertNetworkConfiguration(...args)),
     hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()),
     displayInvalidCustomNetworkAlert: (networkName) => {
       dispatch(displayInvalidCustomNetworkAlert(networkName));
@@ -109,6 +116,7 @@ class NetworkDropdown extends Component {
     dropdownStyles: PropTypes.object,
     hideElementsForOnboarding: PropTypes.bool,
     onAddClick: PropTypes.func,
+    upsertNetworkConfiguration: PropTypes.func.isRequired,
   };
 
   handleClick(newProviderType) {
@@ -231,6 +239,8 @@ class NetworkDropdown extends Component {
         return t('goerli');
       case NETWORK_TYPES.SEPOLIA:
         return t('sepolia');
+      case NETWORK_TYPES.LINEA_TESTNET:
+        return t('lineatestnet');
       case NETWORK_TYPES.LOCALHOST:
         return t('localhost');
       default:
@@ -275,6 +285,78 @@ class NetworkDropdown extends Component {
     );
   }
 
+  renderNonInfuraDefaultNetwork(networkConfigurations, network) {
+    const {
+      provider: { type: providerType },
+      setActiveNetwork,
+      upsertNetworkConfiguration,
+    } = this.props;
+
+    const isCurrentRpcTarget = providerType === NETWORK_TYPES.RPC;
+    return (
+      <DropdownMenuItem
+        key={network}
+        closeMenu={this.props.hideNetworkDropdown}
+        onClick={async () => {
+          const { chainId, ticker, blockExplorerUrl } =
+            BUILT_IN_NETWORKS[network];
+          const networkName = NETWORK_TO_NAME_MAP[network];
+
+          const networkConfiguration = pickBy(
+            networkConfigurations,
+            (config) => config.rpcUrl === CHAIN_ID_TO_RPC_URL_MAP[chainId],
+          );
+
+          let configurationId = null;
+          // eslint-disable-next-line no-extra-boolean-cast, no-implicit-coercion
+          if (!!networkConfiguration) {
+            const rpcUrl = CHAIN_ID_TO_RPC_URL_MAP[chainId];
+            configurationId = await upsertNetworkConfiguration(
+              {
+                rpcUrl,
+                ticker,
+                chainId,
+                nickname: networkName,
+                rpcPrefs: {
+                  blockExplorerUrl,
+                },
+              },
+              {
+                setActive: true,
+                source: EVENT.SOURCE.NETWORK.CUSTOM_NETWORK_FORM,
+              },
+            );
+          }
+          setActiveNetwork(configurationId);
+        }}
+        style={DROP_DOWN_MENU_ITEM_STYLE}
+      >
+        {isCurrentRpcTarget ? (
+          <Icon name={ICON_NAMES.CHECK} color={IconColor.successDefault} />
+        ) : (
+          <div className="network-check__transparent">✓</div>
+        )}
+        <ColorIndicator
+          color={network}
+          size={Size.LG}
+          type={ColorIndicator.TYPES.FILLED}
+        />
+        <span
+          className="network-name-item"
+          data-testid={`${network}-network-item`}
+          style={{
+            color:
+              providerType === network
+                ? 'var(--color-text-default)'
+                : 'var(--color-text-alternative)',
+          }}
+        >
+          {this.context.t(network)}
+        </span>
+      </DropdownMenuItem>
+    );
+  }
+
   render() {
     const {
       history,
@@ -286,9 +368,11 @@ class NetworkDropdown extends Component {
       networkConfigurations,
     } = this.props;
 
-    const rpcListDetailWithoutLocalHost = pickBy(
+    const rpcListDetailWithoutLocalHostAndLinea = pickBy(
       networkConfigurations,
-      (config) => config.rpcUrl !== LOCALHOST_RPC_URL,
+      (config) =>
+        config.rpcUrl !== LOCALHOST_RPC_URL &&
+        config.rpcUrl !== LINEA_TESTNET_RPC_URL,
     );
     const rpcListDetailForLocalHost = pickBy(
       networkConfigurations,
@@ -363,7 +447,7 @@ class NetworkDropdown extends Component {
           {this.renderNetworkEntry(NETWORK_TYPES.MAINNET)}
 
           {this.renderCustomRpcList(
-            rpcListDetailWithoutLocalHost,
+            rpcListDetailWithoutLocalHostAndLinea,
             this.props.provider,
           )}
 
@@ -371,6 +455,14 @@ class NetworkDropdown extends Component {
             <>
               {this.renderNetworkEntry(NETWORK_TYPES.GOERLI)}
               {this.renderNetworkEntry(NETWORK_TYPES.SEPOLIA)}
+              {SHOULD_SHOW_LINEA_TESTNET_NETWORK && (
+                <>
+                  {this.renderNonInfuraDefaultNetwork(
+                    networkConfigurations,
+                    NETWORK_TYPES.LINEA_TESTNET,
+                  )}
+                </>
+              )}
               {this.renderCustomRpcList(
                 rpcListDetailForLocalHost,
                 this.props.provider,
diff --git a/ui/components/app/dropdowns/network-dropdown.test.js b/ui/components/app/dropdowns/network-dropdown.test.js
index 6fc126da0..6e8ee65a6 100644
--- a/ui/components/app/dropdowns/network-dropdown.test.js
+++ b/ui/components/app/dropdowns/network-dropdown.test.js
@@ -6,6 +6,15 @@ import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import { LOCALHOST_RPC_URL } from '../../../../shared/constants/network';
 import NetworkDropdown from './network-dropdown';
 
+// Mock linea test network feature toggle
+jest.mock('../../../../shared/constants/network', () => {
+  const constants = jest.requireActual('../../../../shared/constants/network');
+  return {
+    ...constants,
+    SHOULD_SHOW_LINEA_TESTNET_NETWORK: true,
+  };
+});
+
 describe('Network Dropdown', () => {
   const createMockStore = configureMockStore([thunk]);
 
@@ -103,6 +112,13 @@ describe('Network Dropdown', () => {
       expect(localhostColorIndicator).toBeInTheDocument();
     });
 
+    it('checks background color for seventh ColorIndicator', () => {
+      const lineaColorIndicator = screen.queryByTestId(
+        'color-icon-lineatestnet',
+      );
+      expect(lineaColorIndicator).toBeInTheDocument();
+    });
+
     it('checks that Add Network button is rendered', () => {
       const addNetworkButton = screen.queryByText('Add network');
       expect(addNetworkButton).toBeInTheDocument();
@@ -110,8 +126,7 @@ describe('Network Dropdown', () => {
 
     it('shows test networks in the dropdown', () => {
       const networkItems = screen.queryAllByTestId(/network-item/u);
-
-      expect(networkItems).toHaveLength(6);
+      expect(networkItems).toHaveLength(7);
     });
   });
 
diff --git a/ui/components/app/loading-network-screen/loading-network-screen.component.js b/ui/components/app/loading-network-screen/loading-network-screen.component.js
index bf241cfce..9a258557d 100644
--- a/ui/components/app/loading-network-screen/loading-network-screen.component.js
+++ b/ui/components/app/loading-network-screen/loading-network-screen.component.js
@@ -49,6 +49,8 @@ export default class LoadingNetworkScreen extends PureComponent {
         return t('connectingToGoerli');
       case NETWORK_TYPES.SEPOLIA:
         return t('connectingToSepolia');
+      case NETWORK_TYPES.LINEA_TESTNET:
+        return t('connectingToLineaTestnet');
       default:
         return t('connectingTo', [providerId]);
     }
diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js
index de68e4773..662f665d3 100644
--- a/ui/components/app/signature-request-original/signature-request-original.component.js
+++ b/ui/components/app/signature-request-original/signature-request-original.component.js
@@ -73,6 +73,8 @@ export default class SignatureRequestOriginal extends Component {
         return t('goerli');
       case NETWORK_TYPES.SEPOLIA:
         return t('sepolia');
+      case NETWORK_TYPES.LINEA_TESTNET:
+        return t('lineatestnet');
       case NETWORK_TYPES.LOCALHOST:
         return t('localhost');
       default:
diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js
index 3670730be..b1b40b283 100644
--- a/ui/components/app/signature-request/signature-request.component.js
+++ b/ui/components/app/signature-request/signature-request.component.js
@@ -110,6 +110,8 @@ export default class SignatureRequest extends PureComponent {
         return t('goerli');
       case NETWORK_TYPES.SEPOLIA:
         return t('sepolia');
+      case NETWORK_TYPES.LINEA_TESTNET:
+        return t('lineatestnet');
       case NETWORK_TYPES.LOCALHOST:
         return t('localhost');
       default:
diff --git a/ui/components/ui/typography/typography.js b/ui/components/ui/typography/typography.js
index dd395a5c9..a0eb4dd29 100644
--- a/ui/components/ui/typography/typography.js
+++ b/ui/components/ui/typography/typography.js
@@ -33,6 +33,8 @@ export const ValidColors = [
   Color.sepolia,
   Color.goerliInverse,
   Color.sepoliaInverse,
+  Color.lineaTestnet,
+  Color.lineaTestnetInverse,
 ];
 
 export const ValidTags = [
diff --git a/ui/css/design-system/colors.scss b/ui/css/design-system/colors.scss
index 55c3a6811..0b3e330bf 100644
--- a/ui/css/design-system/colors.scss
+++ b/ui/css/design-system/colors.scss
@@ -41,6 +41,8 @@ $color-map: (
   'sepolia': --color-network-sepolia-default,
   'goerli-inverse':--color-network-goerli-inverse,
   'sepolia-inverse': --color-network-sepolia-inverse,
+  'lineatestnet': --color-network-linea-testnet-default,
+  'lineatestnet-inverse': --color-network-linea-testnet-inverse,
   'localhost': --color-network-localhost-default,
   'transparent': --transparent,
   'flask-purple': --color-flask-default,
diff --git a/ui/css/itcss/components/network.scss b/ui/css/itcss/components/network.scss
index c89f93d55..f7baf1a07 100644
--- a/ui/css/itcss/components/network.scss
+++ b/ui/css/itcss/components/network.scss
@@ -25,6 +25,10 @@
     background-color: rgba(207, 181, 240, 0.7) !important;
   }
 
+  &.linea-test-network .menu-icon-circle div {
+    background-color: rgba(0, 0, 0, 0.7) !important;
+  }
+
   &.localhost-network .menu-icon-circle div {
     background-color: rgba(3, 135, 137, 0.7) !important;
   }
diff --git a/ui/css/utilities/colors.scss b/ui/css/utilities/colors.scss
index 221786dcf..7d2e8e7c8 100644
--- a/ui/css/utilities/colors.scss
+++ b/ui/css/utilities/colors.scss
@@ -4,6 +4,8 @@
   --mainnet: #29b6af;
   --inherit: inherit;
   --transparent: transparent;
+  --color-network-linea-testnet-default: #000;
+  --color-network-linea-testnet-inverse: #fcfcfc;
   // DO NOT CHANGE
   // Required for the QR reader to work properly
   --qr-code-white-background: #fff;
diff --git a/ui/helpers/constants/design-system.ts b/ui/helpers/constants/design-system.ts
index 3ac409fef..c39e95f51 100644
--- a/ui/helpers/constants/design-system.ts
+++ b/ui/helpers/constants/design-system.ts
@@ -46,6 +46,8 @@ export enum Color {
   mainnet = 'mainnet',
   goerli = 'goerli',
   sepolia = 'sepolia',
+  lineaTestnet = 'lineatestnet',
+  lineaTestnetInverse = 'lineatestnet-inverse',
   transparent = 'transparent',
   localhost = 'localhost',
   inherit = 'inherit',
@@ -75,6 +77,7 @@ export enum BackgroundColor {
   mainnet = 'mainnet',
   goerli = 'goerli',
   sepolia = 'sepolia',
+  lineaTestnet = 'lineatestnet',
   transparent = 'transparent',
   localhost = 'localhost',
 }
@@ -100,6 +103,7 @@ export enum BorderColor {
   mainnet = 'mainnet',
   goerli = 'goerli',
   sepolia = 'sepolia',
+  lineaTestnet = 'lineatestnet',
   transparent = 'transparent',
   localhost = 'localhost',
 }
@@ -122,6 +126,8 @@ export enum TextColor {
   inherit = 'inherit',
   goerli = 'goerli',
   sepolia = 'sepolia',
+  lineaTestnet = 'lineatestnet',
+  lineaTestnetInverse = 'lineatestnet-inverse',
   goerliInverse = 'goerli-inverse',
   sepoliaInverse = 'sepolia-inverse',
 }
@@ -144,6 +150,8 @@ export enum IconColor {
   inherit = 'inherit',
   goerli = 'goerli',
   sepolia = 'sepolia',
+  lineaTestnet = 'lineatestnet',
+  lineaTestnetInverse = 'lineatestnet-inverse',
   goerliInverse = 'goerli-inverse',
   sepoliaInverse = 'sepolia-inverse',
 }
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index 477fccab2..75cdab2de 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -254,6 +254,13 @@ export const SETTINGS_CONSTANTS = [
     route: `${NETWORKS_ROUTE}#networks-sepolia`,
     icon: 'fa fa-plug',
   },
+  {
+    tabMessage: (t) => t('networks'),
+    sectionMessage: (t) => t('lineatestnet'),
+    descriptionMessage: (t) => t('lineatestnet'),
+    route: `${NETWORKS_ROUTE}#networks-lineatestnet`,
+    icon: 'fa fa-plug',
+  },
   {
     tabMessage: (t) => t('networks'),
     sectionMessage: (t) => t('localhost'),
diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js
index 76cc601f7..ec4839b07 100644
--- a/ui/helpers/utils/settings-search.test.js
+++ b/ui/helpers/utils/settings-search.test.js
@@ -177,7 +177,7 @@ describe('Settings Search Utils', () => {
     });
 
     it('should get good network section number', () => {
-      expect(getNumberOfSettingsInSection(t, t('networks'))).toStrictEqual(4);
+      expect(getNumberOfSettingsInSection(t, t('networks'))).toStrictEqual(5);
     });
 
     it('should get good experimental section number', () => {
diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index 52e306da5..8598260d4 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -62,6 +62,7 @@ export function isDefaultMetaMaskChain(chainId) {
     chainId === CHAIN_IDS.MAINNET ||
     chainId === CHAIN_IDS.GOERLI ||
     chainId === CHAIN_IDS.SEPOLIA ||
+    chainId === CHAIN_IDS.LINEA_TESTNET ||
     chainId === CHAIN_IDS.LOCALHOST
   ) {
     return true;
diff --git a/ui/helpers/utils/util.test.js b/ui/helpers/utils/util.test.js
index 88184b9b6..535c4e843 100644
--- a/ui/helpers/utils/util.test.js
+++ b/ui/helpers/utils/util.test.js
@@ -1,5 +1,6 @@
 import Bowser from 'bowser';
 import { BN } from 'ethereumjs-util';
+import { CHAIN_IDS } from '../../../shared/constants/network';
 import { addHexPrefixToObjectValues } from '../../../shared/lib/swaps-utils';
 import { toPrecisionWithoutTrailingZeros } from '../../../shared/lib/transactions-controller-utils';
 import * as util from './util';
@@ -907,4 +908,14 @@ describe('util', () => {
       ).toStrictEqual('The Quick Brown \\u202EFox Jumps Over The Lazy Dog');
     });
   });
+
+  describe('isDefaultMetaMaskChain()', () => {
+    it('should return true if the provided chainId is a default MetaMask chain', () => {
+      expect(util.isDefaultMetaMaskChain(CHAIN_IDS.GOERLI)).toBeTruthy();
+    });
+
+    it('should return false if the provided chainId is a not default MetaMask chain', () => {
+      expect(util.isDefaultMetaMaskChain(CHAIN_IDS.CELO)).toBeFalsy();
+    });
+  });
 });
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 8bf4d80af..c6cb8d89b 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -522,6 +522,8 @@ export default class Routes extends Component {
         return t('connectingToGoerli');
       case NETWORK_TYPES.SEPOLIA:
         return t('connectingToSepolia');
+      case NETWORK_TYPES.LINEA_TESTNET:
+        return t('connectingToLineaTestnet');
       default:
         return t('connectingTo', [providerId]);
     }
diff --git a/ui/pages/settings/networks-tab/networks-tab.constants.js b/ui/pages/settings/networks-tab/networks-tab.constants.js
index 088d8a991..ef34723b9 100644
--- a/ui/pages/settings/networks-tab/networks-tab.constants.js
+++ b/ui/pages/settings/networks-tab/networks-tab.constants.js
@@ -4,6 +4,7 @@ import {
   CURRENCY_SYMBOLS,
   CHAIN_IDS,
   NETWORK_TYPES,
+  LINEA_TESTNET_RPC_URL,
 } from '../../../../shared/constants/network';
 
 const defaultNetworksData = [
@@ -43,6 +44,15 @@ const defaultNetworksData = [
     ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.SEPOLIA],
     blockExplorerUrl: 'https://sepolia.etherscan.io',
   },
+  {
+    labelKey: NETWORK_TYPES.LINEA_TESTNET,
+    iconColor: '#234FD5',
+    providerType: NETWORK_TYPES.LINEA_TESTNET,
+    rpcUrl: LINEA_TESTNET_RPC_URL,
+    chainId: CHAIN_IDS.LINEA_TESTNET,
+    ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_TESTNET],
+    blockExplorerUrl: 'https://explorer.goerli.linea.build',
+  },
 ];
 
 export { defaultNetworksData };
diff --git a/ui/pages/settings/networks-tab/networks-tab.js b/ui/pages/settings/networks-tab/networks-tab.js
index 00d6b2024..bbc0443cd 100644
--- a/ui/pages/settings/networks-tab/networks-tab.js
+++ b/ui/pages/settings/networks-tab/networks-tab.js
@@ -20,7 +20,9 @@ import {
   getProvider,
 } from '../../../selectors';
 import {
+  CHAIN_IDS,
   NETWORK_TYPES,
+  SHOULD_SHOW_LINEA_TESTNET_NETWORK,
   TEST_CHAINS,
 } from '../../../../shared/constants/network';
 import { defaultNetworksData } from './networks-tab.constants';
@@ -53,8 +55,8 @@ const NetworksTab = ({ addNewNetwork }) => {
     getNetworksTabSelectedNetworkConfigurationId,
   );
 
-  const networkConfigurationsList = Object.entries(networkConfigurations).map(
-    ([networkConfigurationId, networkConfiguration]) => {
+  const networkConfigurationsList = Object.entries(networkConfigurations)
+    .map(([networkConfigurationId, networkConfiguration]) => {
       return {
         label: networkConfiguration.nickname,
         iconColor: 'var(--color-icon-alternative)',
@@ -66,10 +68,15 @@ const NetworksTab = ({ addNewNetwork }) => {
         isATestNetwork: TEST_CHAINS.includes(networkConfiguration.chainId),
         networkConfigurationId,
       };
-    },
-  );
+    })
+    .filter((network) => network.chainId !== CHAIN_IDS.LINEA_TESTNET);
 
-  const networksToRender = [...defaultNetworks, ...networkConfigurationsList];
+  let networksToRender = [...defaultNetworks, ...networkConfigurationsList];
+  if (!SHOULD_SHOW_LINEA_TESTNET_NETWORK) {
+    networksToRender = networksToRender.filter(
+      (network) => network.chainId !== CHAIN_IDS.LINEA_TESTNET,
+    );
+  }
   let selectedNetwork =
     networksToRender.find(
       (network) =>

From 5e3770eb13b3d071863d5d6e8bd7bbe5e1004e8b Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Tue, 21 Mar 2023 09:49:04 -0700
Subject: [PATCH 038/129] Replace ActionableMessage components with
 BannerAlerts in SIWE Sign-in with Ethereum page (#18207)

* siwe: re-enable warning UI for mismatched domains
- unblocks mismatched domain support
- we may re-add error handling here #18184
- reverts logic from #16616

* siwe: fix mismatch domain warning msg UI

* lint: rm whitespace EOL

* siwe: rm unit test

* lint: fix whitespace

* Icon: support .mm-icon
- apply to SIWE actionable-message
- .mm-icon is a <span>

* lint: fix newline

* Revert "siwe: rm unit test"

This reverts commit c80a4a2e661609c46c76d1e43e05909b6db3f0f5.

* ActionableMessage: add deprecation

* siwe: replace actionable-msg w/ banner-alert

* ActionableMessage: add param for lint

* revert .mm_icon ActionableMessage support

* siwe: create tests

* siwe: fix typo in tests

* siwe: fix - do not allow nested <p> elements

* Update ui/components/app/signature-request-siwe/signature-request-siwe.js

Co-authored-by: George Marshall <george.marshall@consensys.net>

* Update ui/components/app/signature-request-siwe/signature-request-siwe.js

Co-authored-by: George Marshall <george.marshall@consensys.net>

* eslint fix

---------

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
---
 .../signature-request-siwe.test.js.snap       | 245 ++++++++++++++++++
 .../app/signature-request-siwe/index.scss     |  21 --
 .../signature-request-siwe.js                 |  54 ++--
 .../signature-request-siwe.test.js            | 113 ++++++++
 .../actionable-message/actionable-message.js  |  24 ++
 5 files changed, 406 insertions(+), 51 deletions(-)
 create mode 100644 ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
 create mode 100644 ui/components/app/signature-request-siwe/signature-request-siwe.test.js

diff --git a/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap b/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
new file mode 100644
index 000000000..345cfdef7
--- /dev/null
+++ b/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
@@ -0,0 +1,245 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`] = `
+<div>
+  <div
+    class="signature-request-siwe"
+  >
+    <div
+      class="signature-request-siwe-header"
+    >
+      <div
+        class="box permissions-connect-header box--flex-direction-column box--justify-content-center box--display-flex"
+      >
+        <div
+          class="permissions-connect-header__icon"
+        >
+          <div
+            class="site-origin"
+          >
+            <div
+              class="chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined"
+            >
+              <div
+                class="chip__left-icon"
+              >
+                <div
+                  class=""
+                >
+                  <img
+                    alt="icon"
+                    src="https://example-dapp.website/favicon-32x32.png"
+                    style="height: 24px; width: 24px;"
+                  />
+                </div>
+              </div>
+              <span
+                class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
+              >
+                https://example-dapp.website
+              </span>
+            </div>
+          </div>
+        </div>
+        <div
+          class="permissions-connect-header__title"
+        >
+          Sign-in request
+        </div>
+        <div
+          class="permissions-connect-header__subtitle"
+        >
+          This site is requesting to sign in with
+        </div>
+      </div>
+      <div
+        class="account-list-item signature-request-siwe-header__account-list-item"
+        data-testid="account-list-item"
+      >
+        <div
+          class="account-list-item__top-row"
+        >
+          <div
+            class=""
+          >
+            <div
+              class="identicon account-list-item__identicon"
+              style="height: 18px; width: 18px; border-radius: 9px;"
+            >
+              <div
+                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 18px; height: 18px; display: inline-block; background: rgb(250, 58, 0);"
+              >
+                <svg
+                  height="18"
+                  width="18"
+                  x="0"
+                  y="0"
+                >
+                  <rect
+                    fill="#18CDF2"
+                    height="18"
+                    transform="translate(-0.5897213458840913 -1.8586597890715306) rotate(328.9 9 9)"
+                    width="18"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#035E56"
+                    height="18"
+                    transform="translate(-10.292884711218024 5.9582598028585885) rotate(176.2 9 9)"
+                    width="18"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#F26602"
+                    height="18"
+                    transform="translate(9.375661135250958 -7.990391094185859) rotate(468.9 9 9)"
+                    width="18"
+                    x="0"
+                    y="0"
+                  />
+                </svg>
+              </div>
+            </div>
+          </div>
+          <div
+            class="account-list-item__account-name"
+          >
+            Test Account
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="box signature-request-siwe-message box--flex-direction-row"
+    >
+      <div
+        class="box box--flex-direction-column"
+      >
+        <div
+          class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row"
+        >
+          <h4
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography typography--h4 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            Message:
+          </h4>
+          <h6
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography signature-request-siwe-message__sub-text typography--h6 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            Click to sign in and accept the Terms of Service: https://community.metamask.io/tos
+          </h6>
+        </div>
+        <div
+          class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row"
+        >
+          <h4
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography typography--h4 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            URI:
+          </h4>
+          <h6
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography signature-request-siwe-message__sub-text typography--h6 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            http://localhost:8080
+          </h6>
+        </div>
+        <div
+          class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row"
+        >
+          <h4
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography typography--h4 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            Version:
+          </h4>
+          <h6
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography signature-request-siwe-message__sub-text typography--h6 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            1
+          </h6>
+        </div>
+        <div
+          class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row"
+        >
+          <h4
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography typography--h4 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            Chain ID:
+          </h4>
+          <h6
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography signature-request-siwe-message__sub-text typography--h6 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            1
+          </h6>
+        </div>
+        <div
+          class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row"
+        >
+          <h4
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography typography--h4 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            Nonce:
+          </h4>
+          <h6
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography signature-request-siwe-message__sub-text typography--h6 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            STMt6KQMwwdOXE306
+          </h6>
+        </div>
+        <div
+          class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row"
+        >
+          <h4
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography typography--h4 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            Issued At:
+          </h4>
+          <h6
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography signature-request-siwe-message__sub-text typography--h6 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            2023-03-18T21:40:40.823Z
+          </h6>
+        </div>
+        <div
+          class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row"
+        >
+          <h4
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography typography--h4 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            Resources: 2
+          </h4>
+          <h6
+            class="box box--margin-top-2 box--margin-bottom-2 box--flex-direction-row typography signature-request-siwe-message__sub-text typography--h6 typography--weight-normal typography--style-normal typography--color-text-default"
+          >
+            ipfs://Qme7ss3ARVgxv6rXqVPiikMJ8u2NLgmgszg13pYrDKEoiu
+https://example.com/my-web2-claim.json
+          </h6>
+        </div>
+      </div>
+    </div>
+    <div
+      class="page-container__footer signature-request-siwe__page-container-footer"
+    >
+      <footer>
+        <button
+          class="button btn--rounded btn-secondary page-container__footer-button page-container__footer-button__cancel"
+          data-testid="page-container-footer-cancel"
+          role="button"
+          tabindex="0"
+        >
+          Cancel
+        </button>
+        <button
+          class="button btn--rounded btn-primary page-container__footer-button"
+          data-testid="page-container-footer-next"
+          role="button"
+          tabindex="0"
+        >
+          Sign-In
+        </button>
+      </footer>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/app/signature-request-siwe/index.scss b/ui/components/app/signature-request-siwe/index.scss
index 2dedc438a..a68b93148 100644
--- a/ui/components/app/signature-request-siwe/index.scss
+++ b/ui/components/app/signature-request-siwe/index.scss
@@ -20,27 +20,6 @@
     border-radius: 8px;
     box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
   }
-
-  /** @todo replace ActionableMessage or remove overwritten code. */
-  .signature-request-siwe__actionable-message {
-    margin: 0 16px;
-    flex-direction: row;
-    align-items: initial;
-
-    .icon {
-      position: absolute;
-      left: 17px;
-      top: 13px;
-    }
-
-    .actionable-message__message {
-      padding-left: 16px;
-    }
-
-    &.actionable-message--with-icon {
-      padding-left: 16px;
-    }
-  }
 }
 
 .signature-request-siwe__warning-popover {
diff --git a/ui/components/app/signature-request-siwe/signature-request-siwe.js b/ui/components/app/signature-request-siwe/signature-request-siwe.js
index 4ae5533eb..11e515eee 100644
--- a/ui/components/app/signature-request-siwe/signature-request-siwe.js
+++ b/ui/components/app/signature-request-siwe/signature-request-siwe.js
@@ -2,7 +2,7 @@ import React, { useCallback, useContext, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import log from 'loglevel';
-import ActionableMessage from '../../ui/actionable-message';
+import { BannerAlert, Text } from '../../component-library';
 import Popover from '../../ui/popover';
 import Checkbox from '../../ui/check-box';
 import { I18nContext } from '../../../contexts/i18n';
@@ -13,8 +13,10 @@ import {
 } from '../../../selectors';
 import { getAccountByAddress } from '../../../helpers/utils/util';
 import { formatMessageParams } from '../../../../shared/modules/siwe';
-import { Icon } from '../../component-library/icon/icon';
-import { IconColor } from '../../../helpers/constants/design-system';
+import {
+  SEVERITIES,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
 
 import SecurityProviderBannerMessage from '../security-provider-banner-message/security-provider-banner-message';
 import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../security-provider-banner-message/security-provider-banner-message.constants';
@@ -101,38 +103,30 @@ export default function SignatureRequestSIWE({
       ) : null}
       <Message data={formatMessageParams(parsedMessage, t)} />
       {!isMatchingAddress && (
-        <ActionableMessage
-          className="signature-request-siwe__actionable-message"
-          type="warning"
-          message={t('SIWEAddressInvalid', [
+        <BannerAlert
+          severity={SEVERITIES.WARNING}
+          marginLeft={4}
+          marginRight={4}
+          marginBottom={4}
+        >
+          {t('SIWEAddressInvalid', [
             parsedMessage.address,
             fromAccount.address,
           ])}
-          iconFillColor="var(--color-warning-default)"
-          useIcon
-          withRightButton
-          icon={<Icon name="danger" color={IconColor.warningDefault} />}
-        />
+        </BannerAlert>
       )}
       {!isSIWEDomainValid && (
-        <ActionableMessage
-          className="signature-request-siwe__actionable-message"
-          type="danger"
-          message={
-            <>
-              <p
-                className="typography--weight-bold"
-                style={{ display: 'inline' }}
-              >
-                {t('SIWEDomainInvalidTitle')}
-              </p>{' '}
-              {t('SIWEDomainInvalidText')}
-            </>
-          }
-          iconFillColor="var(--color-error-default)"
-          useIcon
-          icon={<Icon name="danger" color={IconColor.errorDefault} />}
-        />
+        <BannerAlert
+          severity={SEVERITIES.DANGER}
+          marginLeft={4}
+          marginRight={4}
+          marginBottom={4}
+        >
+          <Text variant={TextVariant.bodyMdBold}>
+            {t('SIWEDomainInvalidTitle')}
+          </Text>{' '}
+          <Text>{t('SIWEDomainInvalidText')}</Text>
+        </BannerAlert>
       )}
       <PageContainerFooter
         footerClassName="signature-request-siwe__page-container-footer"
diff --git a/ui/components/app/signature-request-siwe/signature-request-siwe.test.js b/ui/components/app/signature-request-siwe/signature-request-siwe.test.js
new file mode 100644
index 000000000..082672338
--- /dev/null
+++ b/ui/components/app/signature-request-siwe/signature-request-siwe.test.js
@@ -0,0 +1,113 @@
+import React from 'react';
+import { cloneDeep } from 'lodash';
+import { MESSAGE_TYPE } from '../../../../shared/constants/app';
+import mockState from '../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import configureStore from '../../../store/store';
+import SignatureRequestSIWE from '.';
+
+const MOCK_ORIGIN = 'https://example-dapp.website';
+const MOCK_ADDRESS = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
+
+const mockStoreInitialState = {
+  metamask: {
+    ...mockState.metamask,
+    subjectMetadata: {
+      [MOCK_ORIGIN]: {
+        iconUrl: 'https://example-dapp.website/favicon-32x32.png',
+        name: 'Example Test Dapp',
+      },
+    },
+  },
+};
+
+const mockProps = {
+  cancelPersonalMessage: jest.fn(),
+  signPersonalMessage: jest.fn(),
+  txData: {
+    msgParams: {
+      from: MOCK_ADDRESS,
+      data: '0x6c6f63616c686f73743a383038302077616e747320796f7520746f207369676e20696e207769746820796f757220457468657265756d206163636f756e743a0a3078466232433135303034333433393034653566343038323537386334653865313131303563463765330a0a436c69636b20746f207369676e20696e20616e642061636365707420746865205465726d73206f6620536572766963653a2068747470733a2f2f636f6d6d756e6974792e6d6574616d61736b2e696f2f746f730a0a5552493a20687474703a2f2f6c6f63616c686f73743a383038300a56657273696f6e3a20310a436861696e2049443a20310a4e6f6e63653a2053544d74364b514d7777644f58453330360a4973737565642041743a20323032322d30332d31385432313a34303a34302e3832335a0a5265736f75726365733a0a2d20697066733a2f2f516d653773733341525667787636725871565069696b4d4a3875324e4c676d67737a673133705972444b456f69750a2d2068747470733a2f2f6578616d706c652e636f6d2f6d792d776562322d636c61696d2e6a736f6e',
+      origin: MOCK_ORIGIN,
+      siwe: {
+        isSIWEMessage: true,
+        parsedMessage: {
+          domain: 'example-dapp.website',
+          address: MOCK_ADDRESS,
+          statement:
+            'Click to sign in and accept the Terms of Service: https://community.metamask.io/tos',
+          uri: 'http://localhost:8080',
+          version: '1',
+          nonce: 'STMt6KQMwwdOXE306',
+          chainId: 1,
+          issuedAt: '2023-03-18T21:40:40.823Z',
+          resources: [
+            'ipfs://Qme7ss3ARVgxv6rXqVPiikMJ8u2NLgmgszg13pYrDKEoiu',
+            'https://example.com/my-web2-claim.json',
+          ],
+        },
+      },
+    },
+    type: MESSAGE_TYPE.PERSONAL_SIGN,
+  },
+};
+
+const render = (txData = mockProps.txData) => {
+  const store = configureStore(mockStoreInitialState);
+
+  return renderWithProvider(
+    <SignatureRequestSIWE {...mockProps} txData={txData} />,
+    store,
+  );
+};
+
+describe('SignatureRequestSIWE (Sign in with Ethereum)', () => {
+  it('should match snapshot', () => {
+    const { container } = render();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render', async () => {
+    const { container, findByText } = render();
+    const bannerAlert = container.querySelector('.mm-banner-alert');
+
+    expect(bannerAlert).not.toBeTruthy();
+    expect(await findByText('Sign-in request')).toBeInTheDocument();
+  });
+
+  it('should render SiteOrigin', () => {
+    const { container } = render();
+    const siteOriginElem = container.querySelector('.site-origin');
+    expect(siteOriginElem).toHaveTextContent(MOCK_ORIGIN);
+  });
+
+  it('should render BannerAlert when addresses do not match', () => {
+    const store = configureStore(mockStoreInitialState);
+    const txData = cloneDeep(mockProps.txData);
+    txData.msgParams.siwe.parsedMessage.address = '0x12345';
+
+    const { container } = renderWithProvider(
+      <SignatureRequestSIWE {...mockProps} txData={txData} />,
+      store,
+    );
+    const bannerAlert = container.querySelector('.mm-banner-alert');
+
+    expect(bannerAlert).toBeTruthy();
+    expect(bannerAlert).toHaveTextContent('does not match the address');
+  });
+
+  it('should render BannerAlert when domains do not match', () => {
+    const store = configureStore(mockStoreInitialState);
+    const txData = cloneDeep(mockProps.txData);
+    txData.msgParams.siwe.parsedMessage.domain = 'potentially-malicious.com';
+
+    const { container } = renderWithProvider(
+      <SignatureRequestSIWE {...mockProps} txData={txData} />,
+      store,
+    );
+    const bannerAlert = container.querySelector('.mm-banner-alert');
+
+    expect(bannerAlert).toBeTruthy();
+    expect(bannerAlert).toHaveTextContent('Deceptive site request.');
+  });
+});
diff --git a/ui/components/ui/actionable-message/actionable-message.js b/ui/components/ui/actionable-message/actionable-message.js
index 4bf5e1698..cb87c946e 100644
--- a/ui/components/ui/actionable-message/actionable-message.js
+++ b/ui/components/ui/actionable-message/actionable-message.js
@@ -16,6 +16,30 @@ export const typeHash = {
   default: '',
 };
 
+/**
+ * @deprecated `<ActionableMessage />` has been deprecated in favour of the `<BannerAlert />`
+ * component in ./ui/components/component-library/banner-alert/banner-alert.js.
+ * See storybook documentation for Text here:
+ * {@see {@link https://metamask.github.io/metamask-storybook/?path=/docs/components-componentlibrary-banneralert--default-story#banneralert}}
+ *
+ * Help to replace `ActionableMessage` with `BannerAlert` by submitting a PR
+ * @param options
+ * @param options.message
+ * @param options.primaryAction
+ * @param options.primaryActionV2
+ * @param options.secondaryAction
+ * @param options.className
+ * @param options.infoTooltipText
+ * @param options.withRightButton
+ * @param options.type
+ * @param options.useIcon
+ * @param options.icon
+ * @param options.iconFillColor
+ * @param options.roundedButtons
+ * @param options.dataTestId
+ * @param options.autoHideTime
+ * @param options.onAutoHide
+ */
 export default function ActionableMessage({
   message = '',
   primaryAction = null,

From be63190b97894e9f4b1f4d6529435f513dfb4fdf Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Tue, 21 Mar 2023 15:07:22 -0230
Subject: [PATCH 039/129] Remove use of `pify` from the static-server script
 (#18239)

The static server script no longer uses `pify`. `pify` was being used
to promisify the `fs.stat` function, but that function has a built-in
Promise-supporting API that is now used instead.
---
 development/static-server.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/development/static-server.js b/development/static-server.js
index facdc915b..bb15133d6 100755
--- a/development/static-server.js
+++ b/development/static-server.js
@@ -1,14 +1,13 @@
 #!/usr/bin/env node
-const fs = require('fs');
+const fs = require('fs').promises;
 const path = require('path');
 
 const chalk = require('chalk');
-const pify = require('pify');
 
 const createStaticServer = require('./create-static-server');
 const { parsePort } = require('./lib/parse-port');
 
-const fsStat = pify(fs.stat);
+const fsStat = fs.stat;
 const DEFAULT_PORT = 9080;
 
 const onResponse = (request, response) => {

From b9f00ba5365cf92429c45f4ad05ced7373f726f5 Mon Sep 17 00:00:00 2001
From: Suryansh Anand <coder.a0gfl@aleeas.com>
Date: Tue, 21 Mar 2023 23:47:59 +0530
Subject: [PATCH 040/129] Changed all Typography to Text component in
 welcome.js and edit-gas-display.component.js (#18116)

Co-authored-by: George Marshall <george.marshall@consensys.net>
---
 .../edit-gas-display.component.js             | 20 +++++----
 ui/pages/onboarding-flow/welcome/welcome.js   | 43 ++++++++++---------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/ui/components/app/edit-gas-display/edit-gas-display.component.js b/ui/components/app/edit-gas-display/edit-gas-display.component.js
index 34a189302..b33bd65c2 100644
--- a/ui/components/app/edit-gas-display/edit-gas-display.component.js
+++ b/ui/components/app/edit-gas-display/edit-gas-display.component.js
@@ -5,14 +5,14 @@ import BigNumber from 'bignumber.js';
 import { EditGasModes } from '../../../../shared/constants/gas';
 
 import Button from '../../ui/button';
-import Typography from '../../ui/typography/typography';
 
 import {
   TEXT_ALIGN,
-  TypographyVariant,
   FONT_WEIGHT,
   TextColor,
+  TextVariant,
 } from '../../../helpers/constants/design-system';
+import { Text } from '../../component-library';
 import { areDappSuggestedAndTxParamGasFeesTheSame } from '../../../helpers/utils/confirm-tx.util';
 
 import InfoTooltip from '../../ui/info-tooltip';
@@ -97,9 +97,10 @@ export default function EditGasDisplay({
         )}
         {mode === EditGasModes.speedUp && (
           <div className="edit-gas-display__top-tooltip">
-            <Typography
+            <Text
               color={TextColor.textDefault}
-              variant={TypographyVariant.H8}
+              variant={TextVariant.bodySm}
+              as="h6"
               fontWeight={FONT_WEIGHT.BOLD}
             >
               {t('speedUpTooltipText')}{' '}
@@ -107,16 +108,17 @@ export default function EditGasDisplay({
                 position="top"
                 contentText={t('speedUpExplanation')}
               />
-            </Typography>
+            </Text>
           </div>
         )}
-        <Typography
+        <Text
           color={TextColor.textDefault}
-          variant={TypographyVariant.H1}
-          align={TEXT_ALIGN.CENTER}
+          variant={TextVariant.displayMd}
+          as="h1"
+          textAlign={TEXT_ALIGN.CENTER}
         >
           {estimatedMinimumNative}
-        </Typography>
+        </Text>
         {requireDappAcknowledgement && (
           <Button
             className="edit-gas-display__dapp-acknowledgement-button"
diff --git a/ui/pages/onboarding-flow/welcome/welcome.js b/ui/pages/onboarding-flow/welcome/welcome.js
index 9a4466b4a..66de54ddd 100644
--- a/ui/pages/onboarding-flow/welcome/welcome.js
+++ b/ui/pages/onboarding-flow/welcome/welcome.js
@@ -5,11 +5,11 @@ import { useHistory } from 'react-router-dom';
 import { Carousel } from 'react-responsive-carousel';
 import Mascot from '../../../components/ui/mascot';
 import Button from '../../../components/ui/button';
-import Typography from '../../../components/ui/typography/typography';
+import { Text } from '../../../components/component-library';
 import {
-  TypographyVariant,
   FONT_WEIGHT,
   TEXT_ALIGN,
+  TextVariant,
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
@@ -81,16 +81,17 @@ export default function OnboardingWelcome() {
     <div className="onboarding-welcome" data-testid="onboarding-welcome">
       <Carousel showThumbs={false} showStatus={false} showArrows>
         <div>
-          <Typography
-            variant={TypographyVariant.H2}
-            align={TEXT_ALIGN.CENTER}
+          <Text
+            variant={TextVariant.headingLg}
+            as="h2"
+            textAlign={TEXT_ALIGN.CENTER}
             fontWeight={FONT_WEIGHT.BOLD}
           >
             {t('welcomeToMetaMask')}
-          </Typography>
-          <Typography align={TEXT_ALIGN.CENTER} marginLeft={6} marginRight={6}>
+          </Text>
+          <Text textAlign={TEXT_ALIGN.CENTER} marginLeft={6} marginRight={6}>
             {t('welcomeToMetaMaskIntro')}
-          </Typography>
+          </Text>
           <div className="onboarding-welcome__mascot">
             <Mascot
               animationEventEmitter={eventEmitter}
@@ -100,16 +101,17 @@ export default function OnboardingWelcome() {
           </div>
         </div>
         <div>
-          <Typography
-            variant={TypographyVariant.H2}
-            align={TEXT_ALIGN.CENTER}
+          <Text
+            variant={TextVariant.headingLg}
+            as="h2"
+            textAlign={TEXT_ALIGN.CENTER}
             fontWeight={FONT_WEIGHT.BOLD}
           >
             {t('welcomeExploreTitle')}
-          </Typography>
-          <Typography align={TEXT_ALIGN.CENTER}>
+          </Text>
+          <Text textAlign={TEXT_ALIGN.CENTER}>
             {t('welcomeExploreDescription')}
-          </Typography>
+          </Text>
           <div className="onboarding-welcome__image">
             <img
               src="/images/onboarding-welcome-say-hello.svg"
@@ -120,16 +122,17 @@ export default function OnboardingWelcome() {
           </div>
         </div>
         <div>
-          <Typography
-            variant={TypographyVariant.H2}
-            align={TEXT_ALIGN.CENTER}
+          <Text
+            variant={TextVariant.headingLg}
+            as="h2"
+            textAlign={TEXT_ALIGN.CENTER}
             fontWeight={FONT_WEIGHT.BOLD}
           >
             {t('welcomeLoginTitle')}
-          </Typography>
-          <Typography align={TEXT_ALIGN.CENTER}>
+          </Text>
+          <Text textAlign={TEXT_ALIGN.CENTER}>
             {t('welcomeLoginDescription')}
-          </Typography>
+          </Text>
           <div className="onboarding-welcome__image">
             <img
               src="/images/onboarding-welcome-decentralised-apps.svg"

From 3fc2adac872ccb61ade2f3e42216b3de1f311631 Mon Sep 17 00:00:00 2001
From: legobeat <109787230+legobeat@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:59:59 +0900
Subject: [PATCH 041/129] devdeps: resolve-url-loader@3.1.2->3.1.5 (#18183)

* devdeps: resolve-url-loader@3.1.2->3.1.5

- bump/dedupe subdependency loader-utils
  - closes GHSA-76p3-8hx3-jpfq / CVE-2022-37601
  - closes GHSA-3rfm-jhwj-7488 / CVE-2022-37603
  - closes GHSA-hhq3-ff78-jv3g / CVE-2022-37599
- bump/dedupe subdependency emojis-list

* devdeps: loader-utils@2.0.0->2.0.4

- closes GHSA-76p3-8hx3-jpfq / CVE-2022-37601
- closes GHSA-3rfm-jhwj-7488 / CVE-2022-37603
- closes GHSA-hhq3-ff78-jv3g / CVE-2022-37599
---
 package.json |  2 +-
 yarn.lock    | 46 ++++++++++++++--------------------------------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 62e4af2ab..75299690a 100644
--- a/package.json
+++ b/package.json
@@ -510,7 +510,7 @@
     "redux-mock-store": "^1.5.4",
     "remote-redux-devtools": "^0.5.16",
     "require-from-string": "^2.0.2",
-    "resolve-url-loader": "^3.1.2",
+    "resolve-url-loader": "^3.1.5",
     "sass": "^1.32.4",
     "sass-loader": "^10.1.1",
     "selenium-webdriver": "^4.3.1",
diff --git a/yarn.lock b/yarn.lock
index 3f1224f76..88cc3b9cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14648,13 +14648,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"emojis-list@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "emojis-list@npm:2.1.0"
-  checksum: fb61fa6356dfcc9fbe6db8e334c29da365a34d3d82a915cb59621883d3023d804fd5edad5acd42b8eec016936e81d3b38e2faf921b32e073758374253afe1272
-  languageName: node
-  linkType: hard
-
 "emojis-list@npm:^3.0.0":
   version: 3.0.0
   resolution: "emojis-list@npm:3.0.0"
@@ -23288,17 +23281,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loader-utils@npm:1.2.3":
-  version: 1.2.3
-  resolution: "loader-utils@npm:1.2.3"
-  dependencies:
-    big.js: ^5.2.2
-    emojis-list: ^2.0.0
-    json5: ^1.0.1
-  checksum: 385407fc2683b6d664276fd41df962296de4a15030bb24389de77b175570c3b56bd896869376ba14cf8b33a9e257e17a91d395739ba7e23b5b68a8749a41df7e
-  languageName: node
-  linkType: hard
-
 "loader-utils@npm:^1.1.0, loader-utils@npm:^1.2.3":
   version: 1.4.0
   resolution: "loader-utils@npm:1.4.0"
@@ -23311,13 +23293,13 @@ __metadata:
   linkType: hard
 
 "loader-utils@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "loader-utils@npm:2.0.0"
+  version: 2.0.4
+  resolution: "loader-utils@npm:2.0.4"
   dependencies:
     big.js: ^5.2.2
     emojis-list: ^3.0.0
     json5: ^2.1.2
-  checksum: 6856423131b50b6f5f259da36f498cfd7fc3c3f8bb17777cf87fdd9159e797d4ba4288d9a96415fd8da62c2906960e88f74711dee72d03a9003bddcd0d364a51
+  checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7
   languageName: node
   linkType: hard
 
@@ -24536,7 +24518,7 @@ __metadata:
     remove-trailing-slash: ^0.1.1
     require-from-string: ^2.0.2
     reselect: ^3.0.1
-    resolve-url-loader: ^3.1.2
+    resolve-url-loader: ^3.1.5
     safe-event-emitter: ^1.0.1
     sass: ^1.32.4
     sass-loader: ^10.1.1
@@ -27730,14 +27712,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:7.0.21":
-  version: 7.0.21
-  resolution: "postcss@npm:7.0.21"
+"postcss@npm:7.0.36":
+  version: 7.0.36
+  resolution: "postcss@npm:7.0.36"
   dependencies:
     chalk: ^2.4.2
     source-map: ^0.6.1
     supports-color: ^6.1.0
-  checksum: 5c11d58a4ffd54ddaf2f2f18ef7be10fc44405559ee56b52e41db8305d1b184d162138994dcce506ab77eef7283887a72d1b81cd1036c7fee106f50af0ef86d3
+  checksum: 4cfc0989b9ad5d0e8971af80d87f9c5beac5c84cb89ff22ad69852edf73c0a2fa348e7e0a135b5897bf893edad0fe86c428769050431ad9b532f072ff530828d
   languageName: node
   linkType: hard
 
@@ -30027,21 +30009,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve-url-loader@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "resolve-url-loader@npm:3.1.2"
+"resolve-url-loader@npm:^3.1.5":
+  version: 3.1.5
+  resolution: "resolve-url-loader@npm:3.1.5"
   dependencies:
     adjust-sourcemap-loader: 3.0.0
     camelcase: 5.3.1
     compose-function: 3.0.3
     convert-source-map: 1.7.0
     es6-iterator: 2.0.3
-    loader-utils: 1.2.3
-    postcss: 7.0.21
+    loader-utils: ^1.2.3
+    postcss: 7.0.36
     rework: 1.0.1
     rework-visit: 1.0.0
     source-map: 0.6.1
-  checksum: 02e559af8d10a8fda8d2cb1c61290b932787309309839288820438b4f25339a8c8cbd52598af89c1c1d277133d74914407e7a760e49acd966425a038798a6e70
+  checksum: eb52911eff20723f07409cc12138d254fa0dd4a4f3b1ba11ee1b29912afb03f1272aaddb523658be1e3a946e0d1bf6f603d0e107753ab83d48ad2116cf04b7f6
   languageName: node
   linkType: hard
 

From d3026e7338fd376e0bf07a785846988d9421ef93 Mon Sep 17 00:00:00 2001
From: legobeat <109787230+legobeat@users.noreply.github.com>
Date: Wed, 22 Mar 2023 10:00:44 +0900
Subject: [PATCH 042/129] devdeps: webpack@5.75.0->5.76.2 (#18182)

CVE-2023-28154 / GHSA-hc6q-2mpp-qw7j
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 88cc3b9cd..ddf886249 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -35046,8 +35046,8 @@ __metadata:
   linkType: hard
 
 "webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5.75.0, webpack@npm:^5.9.0":
-  version: 5.75.0
-  resolution: "webpack@npm:5.75.0"
+  version: 5.76.2
+  resolution: "webpack@npm:5.76.2"
   dependencies:
     "@types/eslint-scope": ^3.7.3
     "@types/estree": ^0.0.51
@@ -35078,7 +35078,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 2bcc5f3c195f375944e8af2f00bf2feea39cb9fda5f763b0d1b00077f1c51783db25c94d3fae96a07dead9fa085e6ae7474417e5ab31719c9776ea5969ceb83a
+  checksum: 86db98299a175c371031449c26077e87b33acd8f45de7f7945ed4b9b37c8ca11bc5169af9c44743efccd4d55e08042a3aa3a3bc42aff831309a0821ffbcd395e
   languageName: node
   linkType: hard
 

From de4cf0a7e57497f5638641f41edb2bb8bd50857b Mon Sep 17 00:00:00 2001
From: Garrett Bear <gwhisten@gmail.com>
Date: Tue, 21 Mar 2023 19:19:49 -0700
Subject: [PATCH 043/129] Fix/button base ellipsis support (#18205)

* ButtonBase ellipsis update

Update ui/components/multichain/account-picker/index.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

Update ui/components/multichain/account-picker/index.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

Update ui/components/multichain/account-picker/index.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

Update ui/components/multichain/account-picker/index.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* buttonbase updates to fix ellipsis

* multichain support

* remove multichain

* code cleanup

* clean up

* component clean up

* span update

* fix snapshots

* fix snapshot

* Updating ButtonBase to reduce html to a minimum but ensure all functionality still works (#18210)

* fix color and disable

* remove unused css

* Update ui/components/component-library/button-base/README.mdx

Co-authored-by: George Marshall <george.marshall@consensys.net>

* fix e2e test from button update

* update e2e test from button base update

---------

Co-authored-by: David Walsh <davidwalsh83@gmail.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
---
 test/e2e/tests/add-account.spec.js            |  2 +-
 test/e2e/tests/failing-contract.spec.js       |  4 +-
 test/e2e/tests/from-import-ui.spec.js         |  8 +--
 .../component-library/button-base/README.mdx  | 27 +++++--
 .../__snapshots__/button-base.test.js.snap    | 16 ++---
 .../button-base/button-base.js                | 70 +++++++++++++------
 .../button-base/button-base.scss              | 13 +---
 .../button-base/button-base.stories.js        | 14 +++-
 .../component-library/button-link/README.mdx  |  4 +-
 .../__snapshots__/button-link.test.js.snap    |  8 +--
 .../button-link/button-link.js                | 22 ++----
 .../button-link/button-link.scss              |  3 -
 .../button-link/button-link.stories.js        |  6 +-
 .../__snapshots__/button-primary.test.js.snap |  8 +--
 .../button-secondary.test.js.snap             |  8 +--
 .../button/__snapshots__/button.test.js.snap  | 32 +++------
 ui/helpers/constants/design-system.ts         |  1 +
 .../__snapshots__/reveal-seed.test.js.snap    | 32 +++------
 18 files changed, 131 insertions(+), 147 deletions(-)

diff --git a/test/e2e/tests/add-account.spec.js b/test/e2e/tests/add-account.spec.js
index dc10beb56..226c8bda9 100644
--- a/test/e2e/tests/add-account.spec.js
+++ b/test/e2e/tests/add-account.spec.js
@@ -242,7 +242,7 @@ describe('Add account', function () {
 
         // enter private key',
         await driver.fill('#private-key-box', testPrivateKey);
-        await driver.clickElement({ text: 'Import', tag: 'span' });
+        await driver.clickElement({ text: 'Import', tag: 'button' });
 
         // should show the correct account name
         const importedAccountName = await driver.findElement(
diff --git a/test/e2e/tests/failing-contract.spec.js b/test/e2e/tests/failing-contract.spec.js
index b3f9bb5c0..3391d878e 100644
--- a/test/e2e/tests/failing-contract.spec.js
+++ b/test/e2e/tests/failing-contract.spec.js
@@ -63,7 +63,7 @@ describe('Failing contract interaction ', function () {
         // dismiss warning and confirm the transaction
         await driver.clickElement({
           text: 'I want to proceed anyway',
-          tag: 'span',
+          tag: 'button',
         });
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
         await driver.waitUntilXWindowHandles(2);
@@ -149,7 +149,7 @@ describe('Failing contract interaction on non-EIP1559 network', function () {
         // dismiss warning and confirm the transaction
         await driver.clickElement({
           text: 'I want to proceed anyway',
-          tag: 'span',
+          tag: 'button',
         });
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
         await driver.waitUntilXWindowHandles(2);
diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js
index 6a9318351..e56882c05 100644
--- a/test/e2e/tests/from-import-ui.spec.js
+++ b/test/e2e/tests/from-import-ui.spec.js
@@ -212,7 +212,7 @@ describe('MetaMask Import UI', function () {
 
         // enter private key',
         await driver.fill('#private-key-box', testPrivateKey1);
-        await driver.clickElement({ text: 'Import', tag: 'span' });
+        await driver.clickElement({ text: 'Import', tag: 'button' });
 
         // should show the correct account name
         const importedAccountName = await driver.findElement(
@@ -239,7 +239,7 @@ describe('MetaMask Import UI', function () {
         await driver.clickElement({ text: 'Import account', tag: 'div' });
         // enter private key
         await driver.fill('#private-key-box', testPrivateKey2);
-        await driver.clickElement({ text: 'Import', tag: 'span' });
+        await driver.clickElement({ text: 'Import', tag: 'button' });
 
         // should see new account in account menu
         const importedAccount2Name = await driver.findElement(
@@ -330,7 +330,7 @@ describe('MetaMask Import UI', function () {
 
         await driver.fill('#json-password-box', 'foobarbazqux');
 
-        await driver.clickElement({ text: 'Import', tag: 'span' });
+        await driver.clickElement({ text: 'Import', tag: 'button' });
 
         // should show the correct account name
         const importedAccountName = await driver.findElement(
@@ -392,7 +392,7 @@ describe('MetaMask Import UI', function () {
 
         // enter private key',
         await driver.fill('#private-key-box', testPrivateKey);
-        await driver.clickElement({ text: 'Import', tag: 'span' });
+        await driver.clickElement({ text: 'Import', tag: 'button' });
 
         // error should occur
         await driver.waitForSelector({
diff --git a/ui/components/component-library/button-base/README.mdx b/ui/components/component-library/button-base/README.mdx
index 239032379..f18d98636 100644
--- a/ui/components/component-library/button-base/README.mdx
+++ b/ui/components/component-library/button-base/README.mdx
@@ -102,7 +102,9 @@ import { ButtonBase } from '../../component-library';
 
 When an `externalLink` prop is passed it will change the element to an anchor(`a`) tag and add the `target="_blank"` and `rel="noopener noreferrer"` attributes.
 
+<Canvas>
   <Story id="components-componentlibrary-buttonbase--external-link" />
+</Canvas>
 
 ```jsx
 import { ButtonBase } from '../../component-library';
@@ -168,7 +170,7 @@ import { ICON_NAMES } from '../icon';
 
 ### RTL
 
-For RTL language support use the `textProps` prop to pass a `textDirection` prop.
+For RTL language support use the `textDirection` prop.
 
 <Canvas>
   <Story id="components-componentlibrary-buttonbase--rtl" />
@@ -187,11 +189,28 @@ import { ButtonBase, ICON_NAMES } from '../../component-library';
   <ButtonBase
     startIconName={ICON_NAMES.ADD_SQUARE}
     endIconName={ICON_NAMES.ARROW_2_RIGHT}
-    textProps={{
-      textDirection: TEXT_DIRECTIONS.RIGHT_TO_LEFT,
-    }}
+    textDirection={TEXT_DIRECTIONS.RIGHT_TO_LEFT}
   >
     Button Demo
   </ButtonBase>
 </>;
 ```
+
+### Ellipsis
+
+Use the boolean `ellipsis` prop to change the if the `ButtonBase` component to have an ellipsis.
+
+Note: this should only be used for dynamic/user generated content or addresses. Generally, button text should be succinct and only contain one or two words.
+
+<Canvas>
+  <Story id="components-componentlibrary-buttonbase--ellipsis" />
+</Canvas>
+
+```jsx
+import { ButtonBase } from '../../component-library';
+
+<Box style={{ width: 180 }}>
+  <ButtonBase>This is long text example without ellipsis</ButtonBase>
+  <ButtonBase ellipsis>This is long text example with ellipsis</ButtonBase>
+</Box>;
+```
diff --git a/ui/components/component-library/button-base/__snapshots__/button-base.test.js.snap b/ui/components/component-library/button-base/__snapshots__/button-base.test.js.snap
index 6dc5bfbcf..9e3221f01 100644
--- a/ui/components/component-library/button-base/__snapshots__/button-base.test.js.snap
+++ b/ui/components/component-library/button-base/__snapshots__/button-base.test.js.snap
@@ -3,17 +3,13 @@
 exports[`ButtonBase should render anchor element correctly by href and externalLink, href target and rel exist 1`] = `
 <div>
   <a
-    class="box mm-button-base mm-button-base--size-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-text--body-md mm-text--color-text-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-pill"
     data-testid="button-base"
     href="https://www.test.com/"
     rel="noopener noreferrer"
     target="_blank"
   >
-    <span
-      class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-    >
-      Button Base
-    </span>
+    Button Base
   </a>
 </div>
 `;
@@ -21,14 +17,10 @@ exports[`ButtonBase should render anchor element correctly by href and externalL
 exports[`ButtonBase should render button element correctly and match snapshot 1`] = `
 <div>
   <button
-    class="box mm-button-base mm-button-base--size-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-text--body-md mm-text--color-text-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-pill"
     data-testid="button-base"
   >
-    <span
-      class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-    >
-      Button base
-    </span>
+    Button base
   </button>
 </div>
 `;
diff --git a/ui/components/component-library/button-base/button-base.js b/ui/components/component-library/button-base/button-base.js
index 1a870284a..c79a757e9 100644
--- a/ui/components/component-library/button-base/button-base.js
+++ b/ui/components/component-library/button-base/button-base.js
@@ -15,6 +15,7 @@ import {
   Size,
   BorderRadius,
   BackgroundColor,
+  IconColor,
 } from '../../../helpers/constants/design-system';
 import { BUTTON_BASE_SIZES } from './button-base.constants';
 
@@ -24,6 +25,7 @@ export const ButtonBase = ({
   children,
   className,
   href,
+  ellipsis = false,
   externalLink,
   size = BUTTON_BASE_SIZES.MD,
   startIconName,
@@ -34,6 +36,7 @@ export const ButtonBase = ({
   disabled,
   iconLoadingProps,
   textProps,
+  color = TextColor.textDefault,
   ...props
 }) => {
   const Tag = href ? 'a' : as;
@@ -42,13 +45,14 @@ export const ButtonBase = ({
     props.rel = 'noopener noreferrer';
   }
   return (
-    <Box
+    <Text
       as={Tag}
       backgroundColor={BackgroundColor.backgroundAlternative}
-      color={TextColor.textDefault}
+      color={loading ? TextColor.transparent : color}
       href={href}
       paddingLeft={4}
       paddingRight={4}
+      ellipsis={ellipsis}
       className={classnames(
         'mm-button-base',
         {
@@ -57,6 +61,7 @@ export const ButtonBase = ({
           'mm-button-base--loading': loading,
           'mm-button-base--disabled': disabled,
           'mm-button-base--block': block,
+          'mm-button-base--ellipsis': ellipsis,
         },
         className,
       )}
@@ -67,33 +72,52 @@ export const ButtonBase = ({
       borderRadius={BorderRadius.pill}
       {...props}
     >
-      <Text
-        as="span"
-        className="mm-button-base__content"
-        justifyContent={JustifyContent.center}
-        alignItems={AlignItems.center}
-        gap={2}
-        variant={TextVariant.bodyMd}
-        color={TextColor.inherit}
-        {...textProps}
-      >
-        {startIconName && (
-          <Icon name={startIconName} size={Size.SM} {...startIconProps} />
-        )}
-        {children}
-        {endIconName && (
-          <Icon name={endIconName} size={Size.SM} {...endIconProps} />
-        )}
-      </Text>
+      {startIconName && (
+        <Icon
+          name={startIconName}
+          size={Size.SM}
+          marginInlineEnd={1}
+          {...startIconProps}
+          color={loading ? IconColor.transparent : startIconProps?.color}
+        />
+      )}
+      {/*
+       * If children is a string and doesn't need truncation or loading
+       * prevent html bloat by rendering just the string
+       * otherwise render with wrapper to allow truncation or loading
+       */}
+      {typeof children === 'string' && !ellipsis && !loading ? (
+        children
+      ) : (
+        <Text
+          as="span"
+          ellipsis={ellipsis}
+          variant={TextVariant.inherit}
+          color={loading ? TextColor.transparent : color}
+          {...textProps}
+        >
+          {children}
+        </Text>
+      )}
+      {endIconName && (
+        <Icon
+          name={endIconName}
+          size={Size.SM}
+          marginInlineStart={1}
+          {...endIconProps}
+          color={loading ? IconColor.transparent : endIconProps?.color}
+        />
+      )}
       {loading && (
         <Icon
           className="mm-button-base__icon-loading"
           name={ICON_NAMES.LOADING}
+          color={color}
           size={Size.MD}
           {...iconLoadingProps}
         />
       )}
-    </Box>
+    </Text>
   );
 };
 
@@ -126,6 +150,10 @@ ButtonBase.propTypes = {
    * When an `href` prop is passed, ButtonBase will automatically change the root element to be an `a` (anchor) tag
    */
   href: PropTypes.string,
+  /**
+   * Used for long strings that can be cut off...
+   */
+  ellipsis: PropTypes.bool,
   /**
    * Boolean indicating if the link targets external content, it will cause the link to open in a new tab
    */
diff --git a/ui/components/component-library/button-base/button-base.scss b/ui/components/component-library/button-base/button-base.scss
index 42e6d24a9..6b4e249c2 100644
--- a/ui/components/component-library/button-base/button-base.scss
+++ b/ui/components/component-library/button-base/button-base.scss
@@ -6,18 +6,13 @@
   vertical-align: middle;
   user-select: none;
 
-  &:active,
-  &:hover {
-    color: var(--color-text-default);
-  }
-
   &--block {
     display: block;
     width: 100%;
   }
 
-  &__content {
-    height: 100%;
+  &--ellipsis {
+    max-width: 100%;
   }
 
   &--size-sm {
@@ -36,10 +31,6 @@
     cursor: not-allowed;
   }
 
-  &--loading &__content {
-    color: transparent;
-  }
-
   &--disabled,
   &:disabled {
     opacity: 0.3;
diff --git a/ui/components/component-library/button-base/button-base.stories.js b/ui/components/component-library/button-base/button-base.stories.js
index ffb512783..0a4afed2c 100644
--- a/ui/components/component-library/button-base/button-base.stories.js
+++ b/ui/components/component-library/button-base/button-base.stories.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import {
   AlignItems,
+  Color,
   DISPLAY,
   FLEX_DIRECTION,
   Size,
@@ -199,11 +200,18 @@ export const Rtl = (args) => (
       {...args}
       startIconName={ICON_NAMES.ADD_SQUARE}
       endIconName={ICON_NAMES.ARROW_2_RIGHT}
-      textProps={{
-        textDirection: TEXT_DIRECTIONS.RIGHT_TO_LEFT,
-      }}
+      textDirection={TEXT_DIRECTIONS.RIGHT_TO_LEFT}
     >
       Button Demo
     </ButtonBase>
   </Box>
 );
+
+export const Ellipsis = (args) => (
+  <Box backgroundColor={Color.iconMuted} style={{ width: 150 }}>
+    <ButtonBase {...args}>Example without ellipsis</ButtonBase>
+    <ButtonBase {...args} ellipsis>
+      Example with ellipsis
+    </ButtonBase>
+  </Box>
+);
diff --git a/ui/components/component-library/button-link/README.mdx b/ui/components/component-library/button-link/README.mdx
index 292190b07..4850161ad 100644
--- a/ui/components/component-library/button-link/README.mdx
+++ b/ui/components/component-library/button-link/README.mdx
@@ -67,7 +67,7 @@ import { ButtonLink, Text, TextVariant } from '../../component-library';
 </Text>
 
 <Text variant={TextVariant.bodyXs}>
-  Inherits the font-size of the parent element and example with textProps override for a success color.
+  Inherits the font-size of the parent element and example with override for a success color.
    <ButtonLink size={Size.inherit}>Learn more</ButtonLink>
 </Text>
 ```
@@ -103,7 +103,7 @@ import { ButtonLink } from '../../component-library';
 
 ### External Link
 
-When an `externalLink` prop is passed it adds the `target="_blank"` and `rel="noopener noreferrer"` attributes. 
+When an `externalLink` prop is passed it adds the `target="_blank"` and `rel="noopener noreferrer"` attributes.
 
 `rel="noreferrer noopener"` is used in links to prevent security vulnerabilities that can be exploited by malicious websites. It disables the window.opener property and prevents the new page from sending the referrer information, providing an additional layer of security.
 
diff --git a/ui/components/component-library/button-link/__snapshots__/button-link.test.js.snap b/ui/components/component-library/button-link/__snapshots__/button-link.test.js.snap
index f62717f6c..1a5c0af51 100644
--- a/ui/components/component-library/button-link/__snapshots__/button-link.test.js.snap
+++ b/ui/components/component-library/button-link/__snapshots__/button-link.test.js.snap
@@ -3,14 +3,10 @@
 exports[`ButtonLink should render button element correctly 1`] = `
 <div>
   <button
-    class="box mm-button-base mm-button-link mm-button-link--size-auto box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
+    class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
     data-testid="button-link"
   >
-    <span
-      class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-    >
-      Button Link
-    </span>
+    Button Link
   </button>
 </div>
 `;
diff --git a/ui/components/component-library/button-link/button-link.js b/ui/components/component-library/button-link/button-link.js
index aa77a788a..c7d7dd14f 100644
--- a/ui/components/component-library/button-link/button-link.js
+++ b/ui/components/component-library/button-link/button-link.js
@@ -3,26 +3,25 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
 import { ButtonBase } from '../button-base';
-import { Text } from '../text';
 import {
   BackgroundColor,
   Color,
   Size,
-  TextVariant,
 } from '../../../helpers/constants/design-system';
 import { BUTTON_LINK_SIZES } from './button-link.constants';
 
 export const ButtonLink = ({
   className,
   danger,
+  disabled,
   size = Size.auto,
-  textProps,
   ...props
 }) => {
   return (
     <ButtonBase
       className={classnames(className, 'mm-button-link', {
         'mm-button-link--type-danger': danger,
+        'mm-button-link--disabled': disabled,
         'mm-button-link--size-inherit': size === BUTTON_LINK_SIZES.INHERIT,
         'mm-button-link--size-auto': size === BUTTON_LINK_SIZES.AUTO,
       })}
@@ -32,13 +31,6 @@ export const ButtonLink = ({
       backgroundColor={BackgroundColor.transparent}
       color={danger ? Color.errorDefault : Color.primaryDefault}
       borderRadius={null}
-      textProps={{
-        variant:
-          size === BUTTON_LINK_SIZES.INHERIT
-            ? TextVariant.inherit
-            : TextVariant.bodyMd,
-        ...textProps,
-      }}
       startIconProps={{
         size: size === BUTTON_LINK_SIZES.INHERIT ? Size.inherit : Size.SM,
       }}
@@ -48,7 +40,7 @@ export const ButtonLink = ({
       iconLoadingProps={{
         size: size === BUTTON_LINK_SIZES.INHERIT ? Size.inherit : Size.MD,
       }}
-      {...props}
+      {...{ disabled, ...props }}
     />
   );
 };
@@ -62,15 +54,15 @@ ButtonLink.propTypes = {
    * Boolean to change button type to Danger when true
    */
   danger: PropTypes.bool,
+  /**
+   * Boolean to disable button
+   */
+  disabled: PropTypes.bool,
   /**
    * Possible size values: 'SIZES.AUTO'(auto), 'SIZES.SM'(32px), 'SIZES.MD'(40px), 'SIZES.LG'(48px), 'SIZES.INHERIT'(inherits parents font-size)
    * Default value is 'SIZES.AUTO'.
    */
   size: PropTypes.oneOf(Object.values(BUTTON_LINK_SIZES)),
-  /**
-   * textProps accepts all the props from Text component
-   */
-  textProps: PropTypes.shape(Text.PropTypes),
   /**
    * ButtonLink accepts all the props from ButtonBase
    */
diff --git a/ui/components/component-library/button-link/button-link.scss b/ui/components/component-library/button-link/button-link.scss
index 5c8a4c10b..30e40042c 100644
--- a/ui/components/component-library/button-link/button-link.scss
+++ b/ui/components/component-library/button-link/button-link.scss
@@ -1,17 +1,14 @@
 .mm-button-link {
   &:hover {
-    color: var(--color-primary-default);
     opacity: 0.5;
   }
 
   &:active {
-    color: var(--color-primary-default);
     opacity: 0.5;
   }
 
   &--disabled {
     &:hover {
-      color: var(--color-primary-default);
       opacity: 0.3;
     }
 
diff --git a/ui/components/component-library/button-link/button-link.stories.js b/ui/components/component-library/button-link/button-link.stories.js
index b97d8de36..bda5a27f4 100644
--- a/ui/components/component-library/button-link/button-link.stories.js
+++ b/ui/components/component-library/button-link/button-link.stories.js
@@ -162,12 +162,12 @@ export const SizeStory = (args) => (
       </ButtonLink>
     </Text>
     <Text variant={TextVariant.bodyXs}>
-      Inherits the font-size of the parent element and example with textProps
-      override for a success color.{' '}
+      Inherits the font-size of the parent element and example with override for
+      a success color.{' '}
       <ButtonLink
         {...args}
         size={Size.inherit}
-        textProps={{ color: TextColor.successDefault }}
+        color={TextColor.successDefault}
       >
         Learn more
       </ButtonLink>
diff --git a/ui/components/component-library/button-primary/__snapshots__/button-primary.test.js.snap b/ui/components/component-library/button-primary/__snapshots__/button-primary.test.js.snap
index 8b0c03a89..8768e1c7c 100644
--- a/ui/components/component-library/button-primary/__snapshots__/button-primary.test.js.snap
+++ b/ui/components/component-library/button-primary/__snapshots__/button-primary.test.js.snap
@@ -3,14 +3,10 @@
 exports[`ButtonPrimary should render button element correctly 1`] = `
 <div>
   <button
-    class="box mm-button-base mm-button-base--size-md mm-button-primary box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-default box--rounded-pill"
     data-testid="button-primary"
   >
-    <span
-      class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-    >
-      Button Primary
-    </span>
+    Button Primary
   </button>
 </div>
 `;
diff --git a/ui/components/component-library/button-secondary/__snapshots__/button-secondary.test.js.snap b/ui/components/component-library/button-secondary/__snapshots__/button-secondary.test.js.snap
index c6f9a3177..fcc63172f 100644
--- a/ui/components/component-library/button-secondary/__snapshots__/button-secondary.test.js.snap
+++ b/ui/components/component-library/button-secondary/__snapshots__/button-secondary.test.js.snap
@@ -3,14 +3,10 @@
 exports[`ButtonSecondary should render button element correctly 1`] = `
 <div>
   <button
-    class="box mm-button-base mm-button-base--size-md mm-button-secondary box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md mm-text--color-primary-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
     data-testid="button-secondary"
   >
-    <span
-      class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-    >
-      Button Secondary
-    </span>
+    Button Secondary
   </button>
 </div>
 `;
diff --git a/ui/components/component-library/button/__snapshots__/button.test.js.snap b/ui/components/component-library/button/__snapshots__/button.test.js.snap
index a0685c51a..7d795a179 100644
--- a/ui/components/component-library/button/__snapshots__/button.test.js.snap
+++ b/ui/components/component-library/button/__snapshots__/button.test.js.snap
@@ -3,14 +3,10 @@
 exports[`Button should render button element correctly 1`] = `
 <div>
   <button
-    class="box mm-button-base mm-button-base--size-md mm-button-primary box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-default box--rounded-pill"
     data-testid="button"
   >
-    <span
-      class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-    >
-      Button
-    </span>
+    Button
   </button>
 </div>
 `;
@@ -18,34 +14,22 @@ exports[`Button should render button element correctly 1`] = `
 exports[`Button should render with different button types 1`] = `
 <div>
   <button
-    class="box mm-button-base mm-button-base--size-md mm-button-primary box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-default box--rounded-pill"
     data-testid="primary"
   >
-    <span
-      class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-    >
-      Button
-    </span>
+    Button
   </button>
   <button
-    class="box mm-button-base mm-button-base--size-md mm-button-secondary box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md mm-text--color-primary-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
     data-testid="secondary"
   >
-    <span
-      class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-    >
-      Button
-    </span>
+    Button
   </button>
   <button
-    class="box mm-button-base mm-button-link mm-button-link--size-auto box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
+    class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
     data-testid="link"
   >
-    <span
-      class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-    >
-      Button
-    </span>
+    Button
   </button>
 </div>
 `;
diff --git a/ui/helpers/constants/design-system.ts b/ui/helpers/constants/design-system.ts
index c39e95f51..a80999cbf 100644
--- a/ui/helpers/constants/design-system.ts
+++ b/ui/helpers/constants/design-system.ts
@@ -130,6 +130,7 @@ export enum TextColor {
   lineaTestnetInverse = 'lineatestnet-inverse',
   goerliInverse = 'goerli-inverse',
   sepoliaInverse = 'sepolia-inverse',
+  transparent = 'transparent',
 }
 
 export enum IconColor {
diff --git a/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap b/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap
index 0d97c028a..5bf39129d 100644
--- a/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap
+++ b/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap
@@ -17,16 +17,12 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
          
         The 
         <a
-          class="box mm-button-base mm-button-link mm-button-link--size-inherit box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
+          class="box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
           href="https://metamask.zendesk.com/hc/en-us/articles/360060826432-What-is-a-Secret-Recovery-Phrase-and-how-to-keep-your-crypto-wallet-secure"
           rel="noopener noreferrer"
           target="_blank"
         >
-          <span
-            class="box mm-text mm-button-base__content mm-text--inherit mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-          >
-            Secret Recovery Phrase (SRP)
-          </span>
+          Secret Recovery Phrase (SRP)
         </a>
          provides 
         <strong
@@ -46,16 +42,12 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
          
         MetaMask is a 
         <a
-          class="box mm-button-base mm-button-link mm-button-link--size-inherit box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
+          class="box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
           href="https://metamask.zendesk.com/hc/en-us/articles/360059952212-MetaMask-is-a-non-custodial-wallet"
           rel="noopener noreferrer"
           target="_blank"
         >
-          <span
-            class="box mm-text mm-button-base__content mm-text--inherit mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-          >
-            non-custodial wallet
-          </span>
+          non-custodial wallet
         </a>
         . That means you're the owner of your SRP.
          
@@ -112,23 +104,15 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
       class="box box--margin-top-auto box--display-flex box--gap-4 box--flex-direction-row"
     >
       <button
-        class="box mm-button-base mm-button-base--size-lg mm-button-secondary box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--width-full box--color-primary-default box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
+        class="box mm-text mm-button-base mm-button-base--size-lg mm-button-secondary mm-text--body-md mm-text--color-primary-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--width-full box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
       >
-        <span
-          class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-        >
-          Cancel
-        </span>
+        Cancel
       </button>
       <button
-        class="box mm-button-base mm-button-base--size-lg mm-button-base--disabled mm-button-primary mm-button-primary--disabled box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--width-full box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
+        class="box mm-text mm-button-base mm-button-base--size-lg mm-button-base--disabled mm-button-primary mm-button-primary--disabled mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--width-full box--background-color-primary-default box--rounded-pill"
         disabled=""
       >
-        <span
-          class="box mm-text mm-button-base__content mm-text--body-md mm-text--color-inherit box--gap-2 box--flex-direction-row box--justify-content-center box--align-items-center box--display-flex"
-        >
-          Next
-        </span>
+        Next
       </button>
     </div>
   </div>

From 7dab4b53a49e436c78597c7c5269690c12c9446d Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 22 Mar 2023 02:52:30 -0500
Subject: [PATCH 044/129] Fix TypographyVariant typescript issues (#18272)

---
 .../secure-your-wallet/skip-srp-backup-popover.js             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js b/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js
index 4e9c69e89..bd64f9347 100644
--- a/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js
+++ b/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js
@@ -87,7 +87,7 @@ export default function SkipSRPBackup({ handleClose }) {
           color={IconColor.errorDefault}
         />
         <Typography
-          variant={TypographyVariant.h3}
+          variant={TypographyVariant.H3}
           fontWeight={FONT_WEIGHT.BOLD}
         >
           {t('skipAccountSecurity')}
@@ -102,7 +102,7 @@ export default function SkipSRPBackup({ handleClose }) {
             />
             <Typography
               className="skip-srp-backup-popover__details"
-              variant={TypographyVariant.h7}
+              variant={TypographyVariant.H7}
             >
               {t('skipAccountSecurityDetails')}
             </Typography>

From c079c4320e1c17a13954cfa9ad88b1422c34d10c Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 22 Mar 2023 05:00:08 -0500
Subject: [PATCH 045/129] UX: Multichain: Account Menu List (#17947)

* UX: Multichain: Account Menu List

* Move to using stylesheet

* Add hover state

* Implement George's suggestions

* Add connected site avatar

* Add hardware tag

* Create story for selected hardware item

* Progress on the AccountListItemMenu

* Add story for AccountListItemMenu

* Better position the account menu

* Fix AvatarFavicon missing name prop

* Update menu options label to be account specific

* Update text of 'View on Explorer'

* Add AccountListMenu component

* Move all items to multichain directory

* Fix paths

* Fix linting, use AvatarIcon

* Add title and close button to account menu

* Center the popover title

* Add search functionality

* Implementation WIP

* Add MULTICHAIN feature flag

* Add MULTICHAIN feature flag, add actions for menu items

* Properly dispatch events

* Fix search box padding

* Fix sizing of menu item text

* Fix isRequired

* Fix alignment of the popover

* Update label for hardware wallet items, add text for no search results

* Update keyring retreival to remove account and add label

* Fix storybook

* Fix double link click issue, prevent wrapping of values

* Use labelProps for tag variant

* Restructure item menu story

* Empower storybooks for all new components

* Allow only 3 decimals for currencies

* Avoid inline styles

* Prefix classes with multichain, fix account-list-menu storybook

* Close the accounts menu when account details is clicked

* Restore tag.js

* Create global file for multichain css

* Add index file for multichain js

* Update file paths

* Ensure the block domain is present in menu

* Add AccountListItem test

* Add AccountListItemMenu tests

* Show account connect to current dapp

* Improve tests

* Make avatar smaller

* Add tooltip for account menu

* Align icon better

* Update snapshot

* Rename files to DS standard

* Add index files for export

* Export all multichain components

* Update snapshot

* Remove embedded style in popover

* Add comments for props, cleanup storybook

* Improve test coverage

* Improve test code quality

* Remove border form avatar

* Switch to using the ButtonLink iconName prop

* Only show tooltip if character limit is reached

* Restore prior search settings

* Add test for tooltip
---
 .metamaskrc.dist                              |   1 +
 .storybook/test-data.js                       |   7 +-
 app/_locales/en/messages.json                 |   9 +
 development/build/config.js                   |   1 +
 development/build/scripts.js                  |   1 +
 .../account-list-item-menu.js                 | 147 ++++++++++
 .../account-list-item-menu.stories.js         |  41 +++
 .../account-list-item-menu.test.js            |  54 ++++
 .../account-list-item-menu/index.js           |   1 +
 .../account-list-item.test.js.snap            | 140 ++++++++++
 .../account-list-item/account-list-item.js    | 255 ++++++++++++++++++
 .../account-list-item.stories.js              | 129 +++++++++
 .../account-list-item.test.js                 | 103 +++++++
 .../multichain/account-list-item/index.js     |   1 +
 .../multichain/account-list-item/index.scss   |  32 +++
 .../account-list-menu/account-list-menu.js    | 196 ++++++++++++++
 .../account-list-menu.stories.js              |  14 +
 .../account-list-menu.test.js                 | 103 +++++++
 .../multichain/account-list-menu/index.js     |   1 +
 .../multichain/account-list-menu/index.scss   |   6 +
 ui/components/multichain/index.js             |   3 +
 ui/components/multichain/index.scss           |   2 +
 ui/components/ui/menu/menu-item.js            |   5 +-
 ui/components/ui/popover/index.scss           |   4 +
 ui/components/ui/popover/popover.component.js |  17 +-
 ui/css/index.scss                             |   1 +
 ui/helpers/constants/design-system.ts         |   1 +
 ui/pages/routes/routes.component.js           |  10 +-
 ui/pages/routes/routes.container.js           |   3 +
 ui/selectors/permissions.js                   |  18 ++
 30 files changed, 1298 insertions(+), 8 deletions(-)
 create mode 100644 ui/components/multichain/account-list-item-menu/account-list-item-menu.js
 create mode 100644 ui/components/multichain/account-list-item-menu/account-list-item-menu.stories.js
 create mode 100644 ui/components/multichain/account-list-item-menu/account-list-item-menu.test.js
 create mode 100644 ui/components/multichain/account-list-item-menu/index.js
 create mode 100644 ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
 create mode 100644 ui/components/multichain/account-list-item/account-list-item.js
 create mode 100644 ui/components/multichain/account-list-item/account-list-item.stories.js
 create mode 100644 ui/components/multichain/account-list-item/account-list-item.test.js
 create mode 100644 ui/components/multichain/account-list-item/index.js
 create mode 100644 ui/components/multichain/account-list-item/index.scss
 create mode 100644 ui/components/multichain/account-list-menu/account-list-menu.js
 create mode 100644 ui/components/multichain/account-list-menu/account-list-menu.stories.js
 create mode 100644 ui/components/multichain/account-list-menu/account-list-menu.test.js
 create mode 100644 ui/components/multichain/account-list-menu/index.js
 create mode 100644 ui/components/multichain/account-list-menu/index.scss
 create mode 100644 ui/components/multichain/index.js
 create mode 100644 ui/components/multichain/index.scss

diff --git a/.metamaskrc.dist b/.metamaskrc.dist
index d5b8114a8..17350a99a 100644
--- a/.metamaskrc.dist
+++ b/.metamaskrc.dist
@@ -7,6 +7,7 @@ PUBNUB_PUB_KEY=
 PUBNUB_SUB_KEY=
 PORTFOLIO_URL=
 TRANSACTION_SECURITY_PROVIDER=
+MULTICHAIN=
 
 ; Set this to test changes to the phishing warning page.
 PHISHING_WARNING_PAGE_URL=
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
index 65bb7fb4c..a7a893354 100644
--- a/.storybook/test-data.js
+++ b/.storybook/test-data.js
@@ -1179,9 +1179,14 @@ const state = {
         accounts: [
           '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
           '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
-          '0x9d0ba4ddac06032527b140912ec808ab9451b788',
         ],
       },
+      {
+        type: HardwareKeyringTypes.ledger,
+        accounts: [
+          '0x9d0ba4ddac06032527b140912ec808ab9451b788'
+        ],
+      }
     ],
     networkConfigurations: {
       'test-networkConfigurationId-1': {
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 1dfc9ec31..ccaa85c05 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -171,6 +171,9 @@
   "addANickname": {
     "message": "Add a nickname"
   },
+  "addAccount": {
+    "message": "Add account"
+  },
   "addAcquiredTokens": {
     "message": "Add the tokens you've acquired using MetaMask"
   },
@@ -1573,6 +1576,9 @@
   "hardware": {
     "message": "Hardware"
   },
+  "hardwareWallet": {
+    "message": "Hardware wallet"
+  },
   "hardwareWalletConnected": {
     "message": "Hardware wallet connected"
   },
@@ -4611,6 +4617,9 @@
     "message": "View $1 on Etherscan",
     "description": "$1 is the action type. e.g (Account, Transaction, Swap)"
   },
+  "viewOnExplorer": {
+    "message": "View on explorer"
+  },
   "viewOnOpensea": {
     "message": "View on Opensea"
   },
diff --git a/development/build/config.js b/development/build/config.js
index 292a5cc0b..e07707caa 100644
--- a/development/build/config.js
+++ b/development/build/config.js
@@ -7,6 +7,7 @@ const commonConfigurationPropertyNames = ['PUBNUB_PUB_KEY', 'PUBNUB_SUB_KEY'];
 
 const configurationPropertyNames = [
   ...commonConfigurationPropertyNames,
+  'MULTICHAIN',
   'INFURA_PROJECT_ID',
   'PHISHING_WARNING_PAGE_URL',
   'PORTFOLIO_URL',
diff --git a/development/build/scripts.js b/development/build/scripts.js
index d28ef4db4..7d6626050 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -1109,6 +1109,7 @@ async function getEnvironmentVariables({ buildTarget, buildType, version }) {
   const iconNames = await generateIconNames();
   return {
     ICON_NAMES: iconNames,
+    MULTICHAIN: config.MULTICHAIN === '1',
     CONF: devMode ? config : {},
     IN_TEST: testing,
     INFURA_PROJECT_ID: getInfuraProjectId({
diff --git a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
new file mode 100644
index 000000000..2d02363b6
--- /dev/null
+++ b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
@@ -0,0 +1,147 @@
+import React, { useContext } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import { getAccountLink } from '@metamask/etherscan-link';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  getRpcPrefsForCurrentProvider,
+  getBlockExplorerLinkText,
+  getCurrentChainId,
+} from '../../../selectors';
+import { NETWORKS_ROUTE } from '../../../helpers/constants/routes';
+import { Menu, MenuItem } from '../../ui/menu';
+import { ICON_NAMES, Text } from '../../component-library';
+import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import { getURLHostName } from '../../../helpers/utils/util';
+import { showModal } from '../../../store/actions';
+import { TextVariant } from '../../../helpers/constants/design-system';
+
+export const AccountListItemMenu = ({
+  anchorElement,
+  blockExplorerUrlSubTitle,
+  onClose,
+  closeMenu,
+  isRemovable,
+  identity,
+}) => {
+  const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
+  const dispatch = useDispatch();
+  const history = useHistory();
+
+  const chainId = useSelector(getCurrentChainId);
+  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
+  const addressLink = getAccountLink(identity.address, chainId, rpcPrefs);
+
+  const blockExplorerLinkText = useSelector(getBlockExplorerLinkText);
+  const openBlockExplorer = () => {
+    trackEvent({
+      event: EVENT_NAMES.EXTERNAL_LINK_CLICKED,
+      category: EVENT.CATEGORIES.NAVIGATION,
+      properties: {
+        link_type: EVENT.EXTERNAL_LINK_TYPES.ACCOUNT_TRACKER,
+        location: 'Account Options',
+        url_domain: getURLHostName(addressLink),
+      },
+    });
+    global.platform.openTab({
+      url: addressLink,
+    });
+    onClose();
+  };
+
+  const routeToAddBlockExplorerUrl = () => {
+    history.push(`${NETWORKS_ROUTE}#blockExplorerUrl`);
+  };
+
+  return (
+    <Menu
+      anchorElement={anchorElement}
+      className="account-list-item-menu"
+      onHide={onClose}
+    >
+      <MenuItem
+        onClick={
+          blockExplorerLinkText.firstPart === 'addBlockExplorer'
+            ? routeToAddBlockExplorerUrl
+            : openBlockExplorer
+        }
+        subtitle={blockExplorerUrlSubTitle || null}
+        iconName={ICON_NAMES.EXPORT}
+        data-testid="account-list-menu-open-explorer"
+      >
+        <Text variant={TextVariant.bodySm}>{t('viewOnExplorer')}</Text>
+      </MenuItem>
+      <MenuItem
+        onClick={() => {
+          dispatch(showModal({ name: 'ACCOUNT_DETAILS' }));
+          trackEvent({
+            event: EVENT_NAMES.NAV_ACCOUNT_DETAILS_OPENED,
+            category: EVENT.CATEGORIES.NAVIGATION,
+            properties: {
+              location: 'Account Options',
+            },
+          });
+          onClose();
+          closeMenu?.();
+        }}
+        iconName={ICON_NAMES.SCAN_BARCODE}
+      >
+        <Text variant={TextVariant.bodySm}>{t('accountDetails')}</Text>
+      </MenuItem>
+      {isRemovable ? (
+        <MenuItem
+          data-testid="account-list-menu-remove"
+          onClick={() => {
+            dispatch(
+              showModal({
+                name: 'CONFIRM_REMOVE_ACCOUNT',
+                identity,
+              }),
+            );
+            onClose();
+          }}
+          iconName={ICON_NAMES.TRASH}
+        >
+          <Text variant={TextVariant.bodySm}>{t('removeAccount')}</Text>
+        </MenuItem>
+      ) : null}
+    </Menu>
+  );
+};
+
+AccountListItemMenu.propTypes = {
+  /**
+   * Element that the menu should display next to
+   */
+  anchorElement: PropTypes.instanceOf(window.Element),
+  /**
+   * Function that executes when the menu is closed
+   */
+  onClose: PropTypes.func.isRequired,
+  /**
+   * Function that closes the menu
+   */
+  closeMenu: PropTypes.func,
+  /**
+   * Domain of the block explorer
+   */
+  blockExplorerUrlSubTitle: PropTypes.string,
+  /**
+   * Represents if the account should be removable
+   */
+  isRemovable: PropTypes.bool.isRequired,
+  /**
+   * Identity of the account
+   */
+  /**
+   * Identity of the account
+   */
+  identity: PropTypes.shape({
+    name: PropTypes.string.isRequired,
+    address: PropTypes.string.isRequired,
+    balance: PropTypes.string.isRequired,
+  }).isRequired,
+};
diff --git a/ui/components/multichain/account-list-item-menu/account-list-item-menu.stories.js b/ui/components/multichain/account-list-item-menu/account-list-item-menu.stories.js
new file mode 100644
index 000000000..5ae50a177
--- /dev/null
+++ b/ui/components/multichain/account-list-item-menu/account-list-item-menu.stories.js
@@ -0,0 +1,41 @@
+import React from 'react';
+import { AccountListItemMenu } from '.';
+
+export default {
+  title: 'Components/Multichain/AccountListItemMenu',
+  component: AccountListItemMenu,
+  argTypes: {
+    anchorElement: {
+      control: 'window.Element',
+    },
+    onClose: {
+      action: 'onClose',
+    },
+    closeMenu: {
+      action: 'closeMenu',
+    },
+    blockExplorerUrlSubTitle: {
+      control: 'text',
+    },
+    isRemovable: {
+      control: 'boolean',
+    },
+    identity: {
+      control: 'object',
+    },
+  },
+  args: {
+    anchorElement: null,
+    identity: {
+      address: '"0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e"',
+      name: 'Account 1',
+      balance: '0x152387ad22c3f0',
+      tokenBalance: '32.09 ETH',
+    },
+    isRemovable: true,
+    blockExplorerUrlSubTitle: 'etherscan.io',
+  },
+};
+
+export const DefaultStory = (args) => <AccountListItemMenu {...args} />;
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/multichain/account-list-item-menu/account-list-item-menu.test.js b/ui/components/multichain/account-list-item-menu/account-list-item-menu.test.js
new file mode 100644
index 000000000..f5b91104b
--- /dev/null
+++ b/ui/components/multichain/account-list-item-menu/account-list-item-menu.test.js
@@ -0,0 +1,54 @@
+/* eslint-disable jest/require-top-level-describe */
+import React from 'react';
+import { renderWithProvider, fireEvent } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import { AccountListItemMenu } from '.';
+
+const identity = {
+  ...mockState.metamask.identities[
+    '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'
+  ],
+  balance: '0x152387ad22c3f0',
+};
+
+const DEFAULT_PROPS = {
+  identity,
+  onClose: jest.fn(),
+  onHide: jest.fn(),
+  isRemovable: false,
+};
+
+const render = (props = {}) => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+    },
+  });
+  const allProps = { ...DEFAULT_PROPS, ...props };
+  return renderWithProvider(<AccountListItemMenu {...allProps} />, store);
+};
+
+describe('AccountListItem', () => {
+  it('renders the URL for explorer', () => {
+    const blockExplorerDomain = 'etherscan.io';
+    const { getByText, getByTestId } = render({
+      blockExplorerUrlSubTitle: blockExplorerDomain,
+    });
+    expect(getByText(blockExplorerDomain)).toBeInTheDocument();
+
+    Object.defineProperty(global, 'platform', {
+      value: {
+        openTab: jest.fn(),
+      },
+    });
+    const openExplorerTabSpy = jest.spyOn(global.platform, 'openTab');
+    fireEvent.click(getByTestId('account-list-menu-open-explorer'));
+    expect(openExplorerTabSpy).toHaveBeenCalled();
+  });
+
+  it('renders remove icon with isRemovable', () => {
+    const { getByTestId } = render({ isRemovable: true });
+    expect(getByTestId('account-list-menu-remove')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/multichain/account-list-item-menu/index.js b/ui/components/multichain/account-list-item-menu/index.js
new file mode 100644
index 000000000..6c0f7c65a
--- /dev/null
+++ b/ui/components/multichain/account-list-item-menu/index.js
@@ -0,0 +1 @@
+export { AccountListItemMenu } from './account-list-item-menu';
diff --git a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
new file mode 100644
index 000000000..c44eb7029
--- /dev/null
+++ b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
@@ -0,0 +1,140 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountListItem renders AccountListItem component and shows account name, address, and balance 1`] = `
+<div>
+  <button
+    class="box multichain-account-list-item box--padding-4 box--display-flex box--gap-2 box--flex-direction-row box--background-color-transparent"
+  >
+    <div
+      class="box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
+    >
+      <div
+        class="mm-avatar-account__jazzicon"
+      >
+        <div
+          style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 24px; height: 24px; display: inline-block; background: rgb(250, 58, 0);"
+        >
+          <svg
+            height="24"
+            width="24"
+            x="0"
+            y="0"
+          >
+            <rect
+              fill="#18CDF2"
+              height="24"
+              transform="translate(-0.786295127845455 -2.478213052095374) rotate(328.9 12 12)"
+              width="24"
+              x="0"
+              y="0"
+            />
+            <rect
+              fill="#035E56"
+              height="24"
+              transform="translate(-13.723846281624033 7.94434640381145) rotate(176.2 12 12)"
+              width="24"
+              x="0"
+              y="0"
+            />
+            <rect
+              fill="#F26602"
+              height="24"
+              transform="translate(12.500881513667943 -10.653854792247811) rotate(468.9 12 12)"
+              width="24"
+              x="0"
+              y="0"
+            />
+          </svg>
+        </div>
+      </div>
+    </div>
+    <div
+      class="box multichain-account-list-item__content box--display-flex box--flex-direction-column"
+    >
+      <div
+        class="box box--display-flex box--flex-direction-column"
+      >
+        <div
+          class="box box--display-flex box--gap-2 box--flex-direction-row box--justify-content-space-between"
+        >
+          <div
+            class="box mm-text mm-text--body-md mm-text--ellipsis mm-text--color-text-default box--flex-direction-row"
+          >
+            Test Account
+          </div>
+          <div
+            class="box box--display-flex box--flex-direction-row box--align-items-center"
+          >
+            <div
+              class="box mm-text mm-text--body-md mm-text--text-align-end mm-text--color-text-default box--flex-direction-row"
+            >
+              <div
+                class="currency-display-component"
+                title="0.006 ETH"
+              >
+                <span
+                  class="currency-display-component__prefix"
+                />
+                <span
+                  class="currency-display-component__text"
+                >
+                  0.006
+                </span>
+                <span
+                  class="currency-display-component__suffix"
+                >
+                  ETH
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="box box--display-flex box--flex-direction-row box--justify-content-space-between"
+      >
+        <p
+          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--flex-direction-row"
+        >
+          0x0dc...e7bc
+        </p>
+        <div
+          class="box mm-text mm-text--body-sm mm-text--text-align-end mm-text--color-text-alternative box--flex-direction-row"
+        >
+          <div
+            class="currency-display-component"
+            title="0.006 ETH"
+          >
+            <span
+              class="currency-display-component__prefix"
+            />
+            <span
+              class="currency-display-component__text"
+            >
+              0.006
+            </span>
+            <span
+              class="currency-display-component__suffix"
+            >
+              ETH
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <div
+        aria-label="Test Account Options"
+        class="box mm-button-icon mm-button-icon--size-sm box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-icon-default box--background-color-transparent box--rounded-lg"
+        data-testid="account-list-item-menu-button"
+        tabindex="0"
+      >
+        <span
+          class="box mm-icon mm-icon--size-sm box--display-inline-block box--flex-direction-row box--color-inherit"
+          style="mask-image: url('./images/icons/more-vertical.svg');"
+        />
+      </div>
+    </div>
+  </button>
+</div>
+`;
diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js
new file mode 100644
index 000000000..f0a2aea8c
--- /dev/null
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -0,0 +1,255 @@
+import React, { useState, useRef } from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+
+import { useSelector } from 'react-redux';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { getRpcPrefsForCurrentProvider } from '../../../selectors';
+import { getURLHostName, shortenAddress } from '../../../helpers/utils/util';
+
+import { AccountListItemMenu } from '..';
+import Box from '../../ui/box/box';
+import {
+  AvatarAccount,
+  ButtonIcon,
+  Text,
+  ICON_NAMES,
+  ICON_SIZES,
+  AvatarFavicon,
+  Tag,
+} from '../../component-library';
+import {
+  Color,
+  TEXT_ALIGN,
+  AlignItems,
+  DISPLAY,
+  TextVariant,
+  FLEX_DIRECTION,
+  BorderRadius,
+  JustifyContent,
+  Size,
+  BorderColor,
+} from '../../../helpers/constants/design-system';
+import {
+  HardwareKeyringTypes,
+  HardwareKeyringNames,
+} from '../../../../shared/constants/hardware-wallets';
+import UserPreferencedCurrencyDisplay from '../../app/user-preferenced-currency-display/user-preferenced-currency-display.component';
+import { SECONDARY, PRIMARY } from '../../../helpers/constants/common';
+import { findKeyringForAddress } from '../../../ducks/metamask/metamask';
+import Tooltip from '../../ui/tooltip/tooltip';
+
+const MAXIMUM_CURRENCY_DECIMALS = 3;
+const MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP = 17;
+
+function getLabel(keyring = {}, t) {
+  const { type } = keyring;
+  switch (type) {
+    case HardwareKeyringTypes.qr:
+      return HardwareKeyringNames.qr;
+    case HardwareKeyringTypes.imported:
+      return t('imported');
+    case HardwareKeyringTypes.trezor:
+      return HardwareKeyringNames.trezor;
+    case HardwareKeyringTypes.ledger:
+      return HardwareKeyringNames.ledger;
+    case HardwareKeyringTypes.lattice:
+      return HardwareKeyringNames.lattice;
+    default:
+      return null;
+  }
+}
+
+export const AccountListItem = ({
+  identity,
+  selected = false,
+  onClick,
+  closeMenu,
+  connectedAvatar,
+  connectedAvatarName,
+}) => {
+  const t = useI18nContext();
+  const [accountOptionsMenuOpen, setAccountOptionsMenuOpen] = useState(false);
+  const ref = useRef(false);
+  const keyring = useSelector((state) =>
+    findKeyringForAddress(state, identity.address),
+  );
+  const label = getLabel(keyring, t);
+
+  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
+  const { blockExplorerUrl } = rpcPrefs;
+  const blockExplorerUrlSubTitle = getURLHostName(blockExplorerUrl);
+
+  return (
+    <Box
+      display={DISPLAY.FLEX}
+      padding={4}
+      gap={2}
+      backgroundColor={selected ? Color.primaryMuted : Color.transparent}
+      className={classnames('multichain-account-list-item', {
+        'multichain-account-list-item--selected': selected,
+      })}
+      as="button"
+      onClick={(e) => {
+        e.preventDefault();
+        // Without this check, the account will be selected after
+        // the account options menu closes
+        if (!accountOptionsMenuOpen) {
+          onClick();
+        }
+      }}
+    >
+      {selected && (
+        <Box
+          className="multichain-account-list-item__selected-indicator"
+          borderRadius={BorderRadius.pill}
+          backgroundColor={Color.primaryDefault}
+        />
+      )}
+      <AvatarAccount
+        borderColor={BorderColor.transparent}
+        size={Size.SM}
+        address={identity.address}
+      ></AvatarAccount>
+      <Box
+        display={DISPLAY.FLEX}
+        flexDirection={FLEX_DIRECTION.COLUMN}
+        className="multichain-account-list-item__content"
+      >
+        <Box display={DISPLAY.FLEX} flexDirection={FLEX_DIRECTION.COLUMN}>
+          <Box
+            display={DISPLAY.FLEX}
+            justifyContent={JustifyContent.spaceBetween}
+            gap={2}
+          >
+            <Text ellipsis as="div">
+              {identity.name.length > MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP ? (
+                <Tooltip
+                  title={identity.name}
+                  position="bottom"
+                  wrapperClassName="multichain-account-list-item__tooltip"
+                >
+                  {identity.name}
+                </Tooltip>
+              ) : (
+                identity.name
+              )}
+            </Text>
+            <Box
+              display={DISPLAY.FLEX}
+              flexDirection={FLEX_DIRECTION.ROW}
+              alignItems={AlignItems.center}
+            >
+              {connectedAvatar ? (
+                <AvatarFavicon
+                  size={Size.XS}
+                  src={connectedAvatar}
+                  name={connectedAvatarName}
+                  marginInlineEnd={2}
+                />
+              ) : null}
+              <Text textAlign={TEXT_ALIGN.END} as="div">
+                <UserPreferencedCurrencyDisplay
+                  ethNumberOfDecimals={MAXIMUM_CURRENCY_DECIMALS}
+                  value={identity.balance}
+                  type={SECONDARY}
+                />
+              </Text>
+            </Box>
+          </Box>
+        </Box>
+        <Box
+          display={DISPLAY.FLEX}
+          justifyContent={JustifyContent.spaceBetween}
+        >
+          <Text variant={TextVariant.bodySm} color={Color.textAlternative}>
+            {shortenAddress(identity.address)}
+          </Text>
+          <Text
+            variant={TextVariant.bodySm}
+            color={Color.textAlternative}
+            textAlign={TEXT_ALIGN.END}
+            as="div"
+          >
+            <UserPreferencedCurrencyDisplay
+              ethNumberOfDecimals={MAXIMUM_CURRENCY_DECIMALS}
+              value={identity.balance}
+              type={PRIMARY}
+            />
+          </Text>
+        </Box>
+        {label ? (
+          <Tag
+            label={label}
+            labelProps={{
+              variant: TextVariant.bodyXs,
+              color: Color.textAlternative,
+            }}
+          />
+        ) : null}
+      </Box>
+      <div ref={ref}>
+        <ButtonIcon
+          ariaLabel={`${identity.name} ${t('options')}`}
+          iconName={ICON_NAMES.MORE_VERTICAL}
+          size={ICON_SIZES.SM}
+          onClick={(e) => {
+            e.stopPropagation();
+            setAccountOptionsMenuOpen(true);
+          }}
+          as="div"
+          tabIndex={0}
+          onKeyPress={(e) => {
+            if (e.key === 'Enter') {
+              setAccountOptionsMenuOpen(true);
+            }
+          }}
+          data-testid="account-list-item-menu-button"
+        />
+        {accountOptionsMenuOpen ? (
+          <AccountListItemMenu
+            anchorElement={ref.current}
+            blockExplorerUrlSubTitle={blockExplorerUrlSubTitle}
+            identity={identity}
+            onClose={() => setAccountOptionsMenuOpen(false)}
+            isRemovable={keyring?.type !== HardwareKeyringTypes.hdKeyTree}
+            closeMenu={closeMenu}
+          />
+        ) : null}
+      </div>
+    </Box>
+  );
+};
+
+AccountListItem.propTypes = {
+  /**
+   * Identity of the account
+   */
+  identity: PropTypes.shape({
+    name: PropTypes.string.isRequired,
+    address: PropTypes.string.isRequired,
+    balance: PropTypes.string.isRequired,
+  }).isRequired,
+  /**
+   * Represents if this account is currently selected
+   */
+  selected: PropTypes.bool,
+  /**
+   * Function to execute when the item is clicked
+   */
+  onClick: PropTypes.func.isRequired,
+  /**
+   * Function that closes the menu
+   */
+  closeMenu: PropTypes.func,
+  /**
+   * File location of the avatar icon
+   */
+  connectedAvatar: PropTypes.string,
+  /**
+   * Text used as the avatar alt text
+   */
+  connectedAvatarName: PropTypes.string,
+};
+
+AccountListItem.displayName = 'AccountListItem';
diff --git a/ui/components/multichain/account-list-item/account-list-item.stories.js b/ui/components/multichain/account-list-item/account-list-item.stories.js
new file mode 100644
index 000000000..627f80bc9
--- /dev/null
+++ b/ui/components/multichain/account-list-item/account-list-item.stories.js
@@ -0,0 +1,129 @@
+import React from 'react';
+
+import { Provider } from 'react-redux';
+
+import testData from '../../../../.storybook/test-data';
+import configureStore from '../../../store/store';
+import { AccountListItem } from '.';
+
+const store = configureStore(testData);
+
+const [chaosAddress, simpleAddress, hardwareAddress] = Object.keys(
+  testData.metamask.identities,
+);
+
+const SIMPLE_IDENTITY = {
+  ...testData.metamask.identities[simpleAddress],
+  balance: '0x152387ad22c3f0',
+};
+
+const HARDWARE_IDENTITY = {
+  ...testData.metamask.identities[hardwareAddress],
+  balance: '0x152387ad22c3f0',
+};
+
+const CHAOS_IDENTITY = {
+  ...testData.metamask.identities[chaosAddress],
+  balance: '0x152387ad22c3f0',
+};
+
+const CONTAINER_STYLES = {
+  style: {
+    width: '328px',
+    border: '1px solid var(--color-border-muted)',
+  },
+};
+
+const onClick = () => console.log('Clicked account!');
+
+export default {
+  title: 'Components/Multichain/AccountListItem',
+  component: AccountListItem,
+  argTypes: {
+    identity: {
+      control: 'object',
+    },
+    selected: {
+      control: 'boolean',
+    },
+    onClick: {
+      action: 'onClick',
+    },
+    closeMenu: {
+      action: 'closeMenu',
+    },
+    connectedAvatar: {
+      control: 'text',
+    },
+    connectedAvatarName: {
+      control: 'text',
+    },
+  },
+  args: {
+    identity: SIMPLE_IDENTITY,
+    onClick,
+  },
+};
+
+export const DefaultStory = (args) => (
+  <div {...CONTAINER_STYLES}>
+    <AccountListItem {...args} />
+  </div>
+);
+
+export const SelectedItem = (args) => (
+  <div {...CONTAINER_STYLES}>
+    <AccountListItem {...args} />
+  </div>
+);
+SelectedItem.args = { selected: true };
+
+export const HardwareItem = (args) => (
+  <div {...CONTAINER_STYLES}>
+    <AccountListItem {...args} />
+  </div>
+);
+HardwareItem.args = { identity: HARDWARE_IDENTITY };
+HardwareItem.decorators = [
+  (story) => <Provider store={store}>{story()}</Provider>,
+];
+
+export const SelectedHardwareItem = (args) => (
+  <div {...CONTAINER_STYLES}>
+    <AccountListItem {...args} />
+  </div>
+);
+SelectedHardwareItem.args = { identity: HARDWARE_IDENTITY, selected: true };
+SelectedHardwareItem.decorators = [
+  (story) => <Provider store={store}>{story()}</Provider>,
+];
+
+export const ChaosDataItem = (args) => (
+  <div {...CONTAINER_STYLES}>
+    <AccountListItem {...args} />
+  </div>
+);
+ChaosDataItem.args = { identity: CHAOS_IDENTITY };
+
+export const ConnectedSiteItem = (args) => (
+  <div {...CONTAINER_STYLES}>
+    <AccountListItem {...args} />
+  </div>
+);
+ConnectedSiteItem.args = {
+  connectedAvatar: 'https://uniswap.org/favicon.ico',
+  connectedAvatarName: 'Uniswap',
+};
+
+export const ConnectedSiteChaosItem = (args) => (
+  <div {...CONTAINER_STYLES}>
+    <AccountListItem {...args} />
+  </div>
+);
+ConnectedSiteChaosItem.args = {
+  identity: CHAOS_IDENTITY,
+  connectedAvatar: 'https://uniswap.org/favicon.ico',
+  connectedAvatarName: 'Uniswap',
+};
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/multichain/account-list-item/account-list-item.test.js b/ui/components/multichain/account-list-item/account-list-item.test.js
new file mode 100644
index 000000000..b8e3e292e
--- /dev/null
+++ b/ui/components/multichain/account-list-item/account-list-item.test.js
@@ -0,0 +1,103 @@
+/* eslint-disable jest/require-top-level-describe */
+import React from 'react';
+import { screen, fireEvent } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import { shortenAddress } from '../../../helpers/utils/util';
+import { AccountListItem } from '.';
+
+const identity = {
+  ...mockState.metamask.identities[
+    '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'
+  ],
+  balance: '0x152387ad22c3f0',
+};
+
+const DEFAULT_PROPS = {
+  identity,
+  onClick: jest.fn(),
+};
+
+const render = (props = {}) => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+    },
+  });
+  const allProps = { ...DEFAULT_PROPS, ...props };
+  return renderWithProvider(<AccountListItem {...allProps} />, store);
+};
+
+describe('AccountListItem', () => {
+  it('renders AccountListItem component and shows account name, address, and balance', () => {
+    const { container } = render();
+    expect(screen.getByText(identity.name)).toBeInTheDocument();
+    expect(
+      screen.getByText(shortenAddress(identity.address)),
+    ).toBeInTheDocument();
+    expect(document.querySelector('[title="0.006 ETH"]')).toBeInTheDocument();
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders selected block when account is selected', () => {
+    render({ selected: true });
+    expect(
+      document.querySelector('.multichain-account-list-item--selected'),
+    ).toBeInTheDocument();
+  });
+
+  it('renders the account name tooltip for long names', () => {
+    render({
+      selected: true,
+      identity: {
+        ...identity,
+        name: 'This is a super long name that requires tooltip',
+      },
+    });
+    expect(
+      document.querySelector('.multichain-account-list-item__tooltip'),
+    ).toBeInTheDocument();
+  });
+
+  it('renders the tree-dot menu to lauch the details menu', () => {
+    render();
+    const optionsButton = document.querySelector(
+      '[aria-label="Test Account Options"]',
+    );
+    expect(optionsButton).toBeInTheDocument();
+    fireEvent.click(optionsButton);
+    expect(document.querySelector('.menu__background')).toBeInTheDocument();
+  });
+
+  it('executes the action when the item is clicked', () => {
+    const onClick = jest.fn();
+    render({ onClick });
+    const item = document.querySelector('.multichain-account-list-item');
+    fireEvent.click(item);
+    expect(onClick).toHaveBeenCalled();
+  });
+
+  it('clicking the three-dot menu opens up options', () => {
+    const onClick = jest.fn();
+    render({ onClick });
+    const item = document.querySelector(
+      '[data-testid="account-list-item-menu-button"]',
+    );
+    fireEvent.click(item);
+    expect(
+      document.querySelector('[data-testid="account-list-menu-open-explorer"]'),
+    ).toBeInTheDocument();
+  });
+
+  it('renders connected site icon', () => {
+    const connectedAvatarName = 'Uniswap';
+    const { getByAltText } = render({
+      connectedAvatar: 'https://uniswap.org/favicon.ico',
+      connectedAvatarName,
+    });
+
+    expect(getByAltText(`${connectedAvatarName} logo`)).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/multichain/account-list-item/index.js b/ui/components/multichain/account-list-item/index.js
new file mode 100644
index 000000000..0926db843
--- /dev/null
+++ b/ui/components/multichain/account-list-item/index.js
@@ -0,0 +1 @@
+export { AccountListItem } from './account-list-item';
diff --git a/ui/components/multichain/account-list-item/index.scss b/ui/components/multichain/account-list-item/index.scss
new file mode 100644
index 000000000..5d74ee152
--- /dev/null
+++ b/ui/components/multichain/account-list-item/index.scss
@@ -0,0 +1,32 @@
+.multichain-account-list-item {
+  position: relative;
+  width: 100%;
+
+  &:not(.account-list-item--selected) {
+    &:hover,
+    &:focus-within {
+      background: var(--color-background-default-hover);
+    }
+  }
+
+  &__selected-indicator {
+    width: 4px;
+    height: calc(100% - 8px);
+    position: absolute;
+    top: 4px;
+    left: 4px;
+  }
+
+  &__content {
+    overflow: hidden;
+    flex: 1;
+  }
+
+  .currency-display-component {
+    flex-wrap: nowrap;
+  }
+
+  &__tooltip {
+    display: inline;
+  }
+}
diff --git a/ui/components/multichain/account-list-menu/account-list-menu.js b/ui/components/multichain/account-list-menu/account-list-menu.js
new file mode 100644
index 000000000..c054b115d
--- /dev/null
+++ b/ui/components/multichain/account-list-menu/account-list-menu.js
@@ -0,0 +1,196 @@
+import React, { useState, useContext } from 'react';
+import PropTypes from 'prop-types';
+import { useHistory } from 'react-router-dom';
+import Fuse from 'fuse.js';
+import { useDispatch, useSelector } from 'react-redux';
+import Box from '../../ui/box/box';
+import {
+  ButtonLink,
+  ICON_NAMES,
+  TextFieldSearch,
+  Text,
+} from '../../component-library';
+import { AccountListItem } from '..';
+import {
+  BLOCK_SIZES,
+  Size,
+  TextColor,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import Popover from '../../ui/popover';
+import {
+  getSelectedAccount,
+  getMetaMaskAccountsOrdered,
+  getConnectedSubjectsForAllAddresses,
+  getOriginOfCurrentTab,
+} from '../../../selectors';
+import { toggleAccountMenu, setSelectedAccount } from '../../../store/actions';
+import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  IMPORT_ACCOUNT_ROUTE,
+  NEW_ACCOUNT_ROUTE,
+  CONNECT_HARDWARE_ROUTE,
+} from '../../../helpers/constants/routes';
+import { getEnvironmentType } from '../../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
+
+export const AccountListMenu = ({ onClose }) => {
+  const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
+  const accounts = useSelector(getMetaMaskAccountsOrdered);
+  const selectedAccount = useSelector(getSelectedAccount);
+  const connectedSites = useSelector(getConnectedSubjectsForAllAddresses);
+  const currentTabOrigin = useSelector(getOriginOfCurrentTab);
+  const history = useHistory();
+  const dispatch = useDispatch();
+
+  const [searchQuery, setSearchQuery] = useState('');
+
+  let searchResults = accounts;
+  if (searchQuery) {
+    const fuse = new Fuse(accounts, {
+      threshold: 0.2,
+      location: 0,
+      distance: 100,
+      maxPatternLength: 32,
+      minMatchCharLength: 1,
+      keys: ['name', 'address'],
+    });
+    fuse.setCollection(accounts);
+    searchResults = fuse.search(searchQuery);
+  }
+
+  return (
+    <Popover title={t('selectAnAccount')} centerTitle onClose={onClose}>
+      <Box className="multichain-account-menu">
+        {/* Search box */}
+        <Box paddingLeft={4} paddingRight={4} paddingBottom={4} paddingTop={0}>
+          <TextFieldSearch
+            size={Size.SM}
+            width={BLOCK_SIZES.FULL}
+            placeholder={t('searchAccounts')}
+            value={searchQuery}
+            onChange={(e) => setSearchQuery(e.target.value)}
+          />
+        </Box>
+        {/* Account list block */}
+        <Box className="multichain-account-menu__list">
+          {searchResults.length === 0 && searchQuery !== '' ? (
+            <Text
+              paddingLeft={4}
+              paddingRight={4}
+              color={TextColor.textMuted}
+              data-testid="multichain-account-menu-no-results"
+            >
+              {t('noAccountsFound')}
+            </Text>
+          ) : null}
+          {searchResults.map((account) => {
+            const connectedSite = connectedSites[account.address]?.find(
+              ({ origin }) => origin === currentTabOrigin,
+            );
+
+            return (
+              <AccountListItem
+                onClick={() => {
+                  dispatch(toggleAccountMenu());
+                  trackEvent({
+                    category: EVENT.CATEGORIES.NAVIGATION,
+                    event: EVENT_NAMES.NAV_ACCOUNT_SWITCHED,
+                    properties: {
+                      location: 'Main Menu',
+                    },
+                  });
+                  dispatch(setSelectedAccount(account.address));
+                }}
+                identity={account}
+                key={account.address}
+                selected={selectedAccount.address === account.address}
+                closeMenu={onClose}
+                connectedAvatar={connectedSite?.iconUrl}
+                connectedAvatarName={connectedSite?.name}
+              />
+            );
+          })}
+        </Box>
+        {/* Add / Import / Hardware */}
+        <Box padding={4}>
+          <Box marginBottom={4}>
+            <ButtonLink
+              size={Size.SM}
+              startIconName={ICON_NAMES.ADD}
+              onClick={() => {
+                dispatch(toggleAccountMenu());
+                trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: EVENT_NAMES.ACCOUNT_ADD_SELECTED,
+                  properties: {
+                    account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
+                    location: 'Main Menu',
+                  },
+                });
+                history.push(NEW_ACCOUNT_ROUTE);
+              }}
+            >
+              {t('addAccount')}
+            </ButtonLink>
+          </Box>
+          <Box marginBottom={4}>
+            <ButtonLink
+              size={Size.SM}
+              startIconName={ICON_NAMES.IMPORT}
+              onClick={() => {
+                dispatch(toggleAccountMenu());
+                trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: EVENT_NAMES.ACCOUNT_ADD_SELECTED,
+                  properties: {
+                    account_type: EVENT.ACCOUNT_TYPES.IMPORTED,
+                    location: 'Main Menu',
+                  },
+                });
+                history.push(IMPORT_ACCOUNT_ROUTE);
+              }}
+            >
+              {t('importAccount')}
+            </ButtonLink>
+          </Box>
+          <Box>
+            <ButtonLink
+              size={Size.SM}
+              startIconName={ICON_NAMES.HARDWARE}
+              onClick={() => {
+                dispatch(toggleAccountMenu());
+                trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: EVENT_NAMES.ACCOUNT_ADD_SELECTED,
+                  properties: {
+                    account_type: EVENT.ACCOUNT_TYPES.HARDWARE,
+                    location: 'Main Menu',
+                  },
+                });
+                if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
+                  global.platform.openExtensionInBrowser(
+                    CONNECT_HARDWARE_ROUTE,
+                  );
+                } else {
+                  history.push(CONNECT_HARDWARE_ROUTE);
+                }
+              }}
+            >
+              {t('hardwareWallet')}
+            </ButtonLink>
+          </Box>
+        </Box>
+      </Box>
+    </Popover>
+  );
+};
+
+AccountListMenu.propTypes = {
+  /**
+   * Function that executes when the menu closes
+   */
+  onClose: PropTypes.func.isRequired,
+};
diff --git a/ui/components/multichain/account-list-menu/account-list-menu.stories.js b/ui/components/multichain/account-list-menu/account-list-menu.stories.js
new file mode 100644
index 000000000..30abe820e
--- /dev/null
+++ b/ui/components/multichain/account-list-menu/account-list-menu.stories.js
@@ -0,0 +1,14 @@
+import React from 'react';
+import { AccountListMenu } from '.';
+
+export default {
+  title: 'Components/Multichain/AccountListMenu',
+  component: AccountListMenu,
+  argTypes: {
+    onClose: {
+      action: 'onClose',
+    },
+  },
+};
+
+export const DefaultStory = (args) => <AccountListMenu {...args} />;
diff --git a/ui/components/multichain/account-list-menu/account-list-menu.test.js b/ui/components/multichain/account-list-menu/account-list-menu.test.js
new file mode 100644
index 000000000..2d34652b7
--- /dev/null
+++ b/ui/components/multichain/account-list-menu/account-list-menu.test.js
@@ -0,0 +1,103 @@
+/* eslint-disable jest/require-top-level-describe */
+import React from 'react';
+import reactRouterDom from 'react-router-dom';
+import { fireEvent, renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import {
+  NEW_ACCOUNT_ROUTE,
+  IMPORT_ACCOUNT_ROUTE,
+  CONNECT_HARDWARE_ROUTE,
+} from '../../../helpers/constants/routes';
+import { AccountListMenu } from '.';
+
+const render = (props = { onClose: () => jest.fn() }) => {
+  const store = configureStore({
+    activeTab: {
+      id: 113,
+      title: 'E2E Test Dapp',
+      origin: 'https://metamask.github.io',
+      protocol: 'https:',
+      url: 'https://metamask.github.io/test-dapp/',
+    },
+    metamask: {
+      ...mockState.metamask,
+    },
+  });
+  return renderWithProvider(<AccountListMenu {...props} />, store);
+};
+
+describe('AccountListMenu', () => {
+  const historyPushMock = jest.fn();
+
+  jest
+    .spyOn(reactRouterDom, 'useHistory')
+    .mockImplementation()
+    .mockReturnValue({ push: historyPushMock });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('displays important controls', () => {
+    const { getByPlaceholderText, getByText } = render();
+
+    expect(getByPlaceholderText('Search accounts')).toBeInTheDocument();
+    expect(getByText('Add account')).toBeInTheDocument();
+    expect(getByText('Import account')).toBeInTheDocument();
+    expect(getByText('Hardware wallet')).toBeInTheDocument();
+  });
+
+  it('navigates to new account screen when clicked', () => {
+    const { getByText } = render();
+    fireEvent.click(getByText('Add account'));
+    expect(historyPushMock).toHaveBeenCalledWith(NEW_ACCOUNT_ROUTE);
+  });
+
+  it('navigates to import account screen when clicked', () => {
+    const { getByText } = render();
+    fireEvent.click(getByText('Import account'));
+    expect(historyPushMock).toHaveBeenCalledWith(IMPORT_ACCOUNT_ROUTE);
+  });
+
+  it('navigates to hardware wallet connection screen when clicked', () => {
+    const { getByText } = render();
+    fireEvent.click(getByText('Hardware wallet'));
+    expect(historyPushMock).toHaveBeenCalledWith(CONNECT_HARDWARE_ROUTE);
+  });
+
+  it('displays accounts for list and filters by search', () => {
+    render();
+    const listItems = document.querySelectorAll(
+      '.multichain-account-list-item',
+    );
+    expect(listItems).toHaveLength(4);
+
+    const searchBox = document.querySelector('input[type=search]');
+    fireEvent.change(searchBox, {
+      target: { value: 'Le' },
+    });
+
+    const filteredListItems = document.querySelectorAll(
+      '.multichain-account-list-item',
+    );
+    expect(filteredListItems).toHaveLength(1);
+  });
+
+  it('displays the "no accounts" message when search finds nothing', () => {
+    const { getByTestId } = render();
+
+    const searchBox = document.querySelector('input[type=search]');
+    fireEvent.change(searchBox, {
+      target: { value: 'adslfkjlx' },
+    });
+
+    const filteredListItems = document.querySelectorAll(
+      '.multichain-account-list-item',
+    );
+    expect(filteredListItems).toHaveLength(0);
+    expect(
+      getByTestId('multichain-account-menu-no-results'),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/multichain/account-list-menu/index.js b/ui/components/multichain/account-list-menu/index.js
new file mode 100644
index 000000000..c7c28c3b8
--- /dev/null
+++ b/ui/components/multichain/account-list-menu/index.js
@@ -0,0 +1 @@
+export { AccountListMenu } from './account-list-menu';
diff --git a/ui/components/multichain/account-list-menu/index.scss b/ui/components/multichain/account-list-menu/index.scss
new file mode 100644
index 000000000..5bbb6f0f1
--- /dev/null
+++ b/ui/components/multichain/account-list-menu/index.scss
@@ -0,0 +1,6 @@
+.multichain-account-menu {
+  &__list {
+    max-height: 200px;
+    overflow: auto;
+  }
+}
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
new file mode 100644
index 000000000..49c3563e4
--- /dev/null
+++ b/ui/components/multichain/index.js
@@ -0,0 +1,3 @@
+export { AccountListItem } from './account-list-item';
+export { AccountListItemMenu } from './account-list-item-menu';
+export { AccountListMenu } from './account-list-menu';
diff --git a/ui/components/multichain/index.scss b/ui/components/multichain/index.scss
new file mode 100644
index 000000000..bef86b1dd
--- /dev/null
+++ b/ui/components/multichain/index.scss
@@ -0,0 +1,2 @@
+@import 'account-list-item/index';
+@import 'account-list-menu/index';
diff --git a/ui/components/ui/menu/menu-item.js b/ui/components/ui/menu/menu-item.js
index c3c409cc4..abdebf108 100644
--- a/ui/components/ui/menu/menu-item.js
+++ b/ui/components/ui/menu/menu-item.js
@@ -2,7 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
-import { Icon, ICON_SIZES } from '../../component-library';
+import { Text, Icon, ICON_SIZES } from '../../component-library';
+import { TextVariant } from '../../../helpers/constants/design-system';
 
 const MenuItem = ({
   children,
@@ -22,7 +23,7 @@ const MenuItem = ({
     ) : null}
     <div>
       <div>{children}</div>
-      {subtitle ? <div>{subtitle}</div> : null}
+      {subtitle ? <Text variant={TextVariant.bodyXs}>{subtitle}</Text> : null}
     </div>
   </button>
 );
diff --git a/ui/components/ui/popover/index.scss b/ui/components/ui/popover/index.scss
index acb22a510..0a22355eb 100644
--- a/ui/components/ui/popover/index.scss
+++ b/ui/components/ui/popover/index.scss
@@ -22,6 +22,10 @@
 
   &-header {
     position: relative;
+
+    &__title--center {
+      flex: 1;
+    }
   }
 
   &-bg {
diff --git a/ui/components/ui/popover/popover.component.js b/ui/components/ui/popover/popover.component.js
index 1defc3741..23a06f759 100644
--- a/ui/components/ui/popover/popover.component.js
+++ b/ui/components/ui/popover/popover.component.js
@@ -15,6 +15,8 @@ import {
   Size,
   BorderColor,
   IconColor,
+  TEXT_ALIGN,
+  BLOCK_SIZES,
 } from '../../../helpers/constants/design-system';
 import {
   ButtonIcon,
@@ -76,9 +78,10 @@ const Popover = ({
       <Box
         display={DISPLAY.FLEX}
         alignItems={AlignItems.center}
-        justifyContent={
-          centerTitle ? JustifyContent.center : JustifyContent.spaceBetween
-        }
+        justifyContent={centerTitle ? null : JustifyContent.spaceBetween}
+        className={classnames('popover-header__title', {
+          'popover-header__title--center': centerTitle,
+        })}
         marginBottom={2}
       >
         {onBack ? (
@@ -90,7 +93,13 @@ const Popover = ({
             size={Size.SM}
           />
         ) : null}
-        <Text ellipsis variant={TextVariant.headingSm} as="h2">
+        <Text
+          textAlign={centerTitle ? TEXT_ALIGN.CENTER : TEXT_ALIGN.START}
+          ellipsis
+          variant={TextVariant.headingSm}
+          as="h2"
+          width={BLOCK_SIZES.FULL}
+        >
           {title}
         </Text>
         {onClose ? (
diff --git a/ui/css/index.scss b/ui/css/index.scss
index d861b7210..46e1e7f2b 100644
--- a/ui/css/index.scss
+++ b/ui/css/index.scss
@@ -10,6 +10,7 @@
 @import './base-styles.scss';
 @import '../components/component-library/component-library-components.scss';
 @import '../components/app/app-components';
+@import '../components/multichain/index.scss';
 @import '../components/ui/ui-components';
 @import '../pages/pages';
 @import './errors.scss';
diff --git a/ui/helpers/constants/design-system.ts b/ui/helpers/constants/design-system.ts
index a80999cbf..bc17859c0 100644
--- a/ui/helpers/constants/design-system.ts
+++ b/ui/helpers/constants/design-system.ts
@@ -303,6 +303,7 @@ export const TEXT_ALIGN = {
   RIGHT: 'right',
   JUSTIFY: 'justify',
   END: 'end',
+  START: 'start',
 };
 
 export const TEXT_TRANSFORM = {
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index c6cb8d89b..8cb160764 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -90,6 +90,7 @@ import { SEND_STAGES } from '../../ducks/send';
 import DeprecatedTestNetworks from '../../components/ui/deprecated-test-networks/deprecated-test-networks';
 import NewNetworkInfo from '../../components/ui/new-network-info/new-network-info';
 import { ThemeType } from '../../../shared/constants/preferences';
+import { AccountListMenu } from '../../components/multichain';
 
 export default class Routes extends Component {
   static propTypes = {
@@ -125,6 +126,8 @@ export default class Routes extends Component {
     forgottenPassword: PropTypes.bool,
     isCurrentProviderCustom: PropTypes.bool,
     completedOnboarding: PropTypes.bool,
+    isAccountMenuOpen: PropTypes.bool,
+    toggleAccountMenu: PropTypes.func,
   };
 
   static contextTypes = {
@@ -427,6 +430,8 @@ export default class Routes extends Component {
       shouldShowSeedPhraseReminder,
       isCurrentProviderCustom,
       completedOnboarding,
+      isAccountMenuOpen,
+      toggleAccountMenu,
     } = this.props;
     const loadMessage =
       loadingMessage || isNetworkLoading
@@ -483,7 +488,10 @@ export default class Routes extends Component {
         )}
         {this.showOnboardingHeader() && <OnboardingAppHeader />}
         {completedOnboarding ? <NetworkDropdown /> : null}
-        <AccountMenu />
+        {process.env.MULTICHAIN ? null : <AccountMenu />}
+        {process.env.MULTICHAIN && isAccountMenuOpen ? (
+          <AccountListMenu onClose={() => toggleAccountMenu()} />
+        ) : null}
         <div className="main-container-wrapper">
           {isLoading ? <Loading loadingMessage={loadMessage} /> : null}
           {!isLoading && isNetworkLoading ? <LoadingNetwork /> : null}
diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
index baa22c162..c132bcfa8 100644
--- a/ui/pages/routes/routes.container.js
+++ b/ui/pages/routes/routes.container.js
@@ -18,6 +18,7 @@ import {
   setCurrentCurrency,
   setLastActiveTime,
   setMouseUserState,
+  toggleAccountMenu,
 } from '../../store/actions';
 import { pageChanged } from '../../ducks/history/history';
 import { prepareToLeaveSwaps } from '../../ducks/swaps/swaps';
@@ -55,6 +56,7 @@ function mapStateToProps(state) {
     forgottenPassword: state.metamask.forgottenPassword,
     isCurrentProviderCustom: isCurrentProviderCustom(state),
     completedOnboarding,
+    isAccountMenuOpen: state.metamask.isAccountMenuOpen,
   };
 }
 
@@ -67,6 +69,7 @@ function mapDispatchToProps(dispatch) {
     setLastActiveTime: () => dispatch(setLastActiveTime()),
     pageChanged: (path) => dispatch(pageChanged(path)),
     prepareToLeaveSwaps: () => dispatch(prepareToLeaveSwaps()),
+    toggleAccountMenu: () => dispatch(toggleAccountMenu()),
   };
 }
 
diff --git a/ui/selectors/permissions.js b/ui/selectors/permissions.js
index 27f5c4c88..d4b3d90de 100644
--- a/ui/selectors/permissions.js
+++ b/ui/selectors/permissions.js
@@ -100,6 +100,24 @@ export function getConnectedSubjectsForSelectedAddress(state) {
   return connectedSubjects;
 }
 
+export function getConnectedSubjectsForAllAddresses(state) {
+  const subjects = getPermissionSubjects(state);
+  const subjectMetadata = getSubjectMetadata(state);
+
+  const accountsToConnections = {};
+  Object.entries(subjects).forEach(([subjectKey, subjectValue]) => {
+    const exposedAccounts = getAccountsFromSubject(subjectValue);
+    exposedAccounts.forEach((address) => {
+      if (!accountsToConnections[address]) {
+        accountsToConnections[address] = [];
+      }
+      accountsToConnections[address].push(subjectMetadata[subjectKey] || {});
+    });
+  });
+
+  return accountsToConnections;
+}
+
 export function getSubjectsWithPermission(state, permissionName) {
   const subjects = getPermissionSubjects(state);
 

From cedef121a36184cde4eae448ef510733fa301072 Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Wed, 22 Mar 2023 16:39:58 +0530
Subject: [PATCH 046/129] updated keyringType (#18273)

---
 .storybook/test-data.js                        |  8 +++-----
 .../account-list-item/account-list-item.js     | 18 ++++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.storybook/test-data.js b/.storybook/test-data.js
index a7a893354..3f133fcba 100644
--- a/.storybook/test-data.js
+++ b/.storybook/test-data.js
@@ -1182,11 +1182,9 @@ const state = {
         ],
       },
       {
-        type: HardwareKeyringTypes.ledger,
-        accounts: [
-          '0x9d0ba4ddac06032527b140912ec808ab9451b788'
-        ],
-      }
+        type: KeyringType.ledger,
+        accounts: ['0x9d0ba4ddac06032527b140912ec808ab9451b788'],
+      },
     ],
     networkConfigurations: {
       'test-networkConfigurationId-1': {
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 f0a2aea8c..bbfd277a4 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -30,10 +30,8 @@ import {
   Size,
   BorderColor,
 } from '../../../helpers/constants/design-system';
-import {
-  HardwareKeyringTypes,
-  HardwareKeyringNames,
-} from '../../../../shared/constants/hardware-wallets';
+import { HardwareKeyringNames } from '../../../../shared/constants/hardware-wallets';
+import { KeyringType } from '../../../../shared/constants/keyring';
 import UserPreferencedCurrencyDisplay from '../../app/user-preferenced-currency-display/user-preferenced-currency-display.component';
 import { SECONDARY, PRIMARY } from '../../../helpers/constants/common';
 import { findKeyringForAddress } from '../../../ducks/metamask/metamask';
@@ -45,15 +43,15 @@ const MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP = 17;
 function getLabel(keyring = {}, t) {
   const { type } = keyring;
   switch (type) {
-    case HardwareKeyringTypes.qr:
+    case KeyringType.qr:
       return HardwareKeyringNames.qr;
-    case HardwareKeyringTypes.imported:
+    case KeyringType.imported:
       return t('imported');
-    case HardwareKeyringTypes.trezor:
+    case KeyringType.trezor:
       return HardwareKeyringNames.trezor;
-    case HardwareKeyringTypes.ledger:
+    case KeyringType.ledger:
       return HardwareKeyringNames.ledger;
-    case HardwareKeyringTypes.lattice:
+    case KeyringType.lattice:
       return HardwareKeyringNames.lattice;
     default:
       return null;
@@ -212,7 +210,7 @@ export const AccountListItem = ({
             blockExplorerUrlSubTitle={blockExplorerUrlSubTitle}
             identity={identity}
             onClose={() => setAccountOptionsMenuOpen(false)}
-            isRemovable={keyring?.type !== HardwareKeyringTypes.hdKeyTree}
+            isRemovable={keyring?.type !== KeyringType.hdKeyTree}
             closeMenu={closeMenu}
           />
         ) : null}

From 735f86cac23680792711e07b6f995a84660dfbe1 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Wed, 22 Mar 2023 12:18:17 +0000
Subject: [PATCH 047/129] Remove personal message manager (#18260)

---
 app/scripts/lib/personal-message-manager.js   | 370 ------------------
 .../lib/personal-message-manager.test.js      | 182 ---------
 2 files changed, 552 deletions(-)
 delete mode 100644 app/scripts/lib/personal-message-manager.js
 delete mode 100644 app/scripts/lib/personal-message-manager.test.js

diff --git a/app/scripts/lib/personal-message-manager.js b/app/scripts/lib/personal-message-manager.js
deleted file mode 100644
index bb0a2b0c1..000000000
--- a/app/scripts/lib/personal-message-manager.js
+++ /dev/null
@@ -1,370 +0,0 @@
-import EventEmitter from 'events';
-import { ObservableStore } from '@metamask/obs-store';
-import { bufferToHex } from 'ethereumjs-util';
-import { ethErrors } from 'eth-rpc-errors';
-import log from 'loglevel';
-import { MESSAGE_TYPE } from '../../../shared/constants/app';
-import { METAMASK_CONTROLLER_EVENTS } from '../metamask-controller';
-import createId from '../../../shared/modules/random-id';
-import { EVENT } from '../../../shared/constants/metametrics';
-import { detectSIWE } from '../../../shared/modules/siwe';
-import { stripHexPrefix } from '../../../shared/modules/hexstring-utils';
-import { addHexPrefix } from './util';
-
-const hexRe = /^[0-9A-Fa-f]+$/gu;
-
-/**
- * Represents, and contains data about, an 'personal_sign' type signature request. These are created when a
- * signature for an personal_sign call is requested.
- *
- * @see {@link https://web3js.readthedocs.io/en/1.0/web3-eth-personal.html#sign}
- * @typedef {object} PersonalMessage
- * @property {number} id An id to track and identify the message object
- * @property {object} msgParams The parameters to pass to the personal_sign method once the signature request is
- * approved.
- * @property {object} msgParams.metamaskId Added to msgParams for tracking and identification within MetaMask.
- * @property {string} msgParams.data A hex string conversion of the raw buffer data of the signature request
- * @property {number} time The epoch time at which the this message was created
- * @property {string} status Indicates whether the signature request is 'unapproved', 'approved', 'signed' or 'rejected'
- * @property {string} type The json-prc signing method for which a signature request has been made. A 'Message' will
- * always have a 'personal_sign' type.
- */
-
-export default class PersonalMessageManager extends EventEmitter {
-  /**
-   * Controller in charge of managing - storing, adding, removing, updating - PersonalMessage.
-   *
-   * @param options
-   * @param options.metricsEvent
-   * @param options.securityProviderRequest
-   */
-  constructor({ metricsEvent, securityProviderRequest }) {
-    super();
-    this.memStore = new ObservableStore({
-      unapprovedPersonalMsgs: {},
-      unapprovedPersonalMsgCount: 0,
-    });
-
-    this.resetState = () => {
-      this.memStore.updateState({
-        unapprovedPersonalMsgs: {},
-        unapprovedPersonalMsgCount: 0,
-      });
-    };
-
-    this.messages = [];
-    this.metricsEvent = metricsEvent;
-    this.securityProviderRequest = securityProviderRequest;
-  }
-
-  /**
-   * A getter for the number of 'unapproved' PersonalMessages in this.messages
-   *
-   * @returns {number} The number of 'unapproved' PersonalMessages in this.messages
-   */
-  get unapprovedPersonalMsgCount() {
-    return Object.keys(this.getUnapprovedMsgs()).length;
-  }
-
-  /**
-   * A getter for the 'unapproved' PersonalMessages in this.messages
-   *
-   * @returns {object} An index of PersonalMessage ids to PersonalMessages, for all 'unapproved' PersonalMessages in
-   * this.messages
-   */
-  getUnapprovedMsgs() {
-    return this.messages
-      .filter((msg) => msg.status === 'unapproved')
-      .reduce((result, msg) => {
-        result[msg.id] = msg;
-        return result;
-      }, {});
-  }
-
-  /**
-   * Creates a new PersonalMessage with an 'unapproved' status using the passed msgParams. this.addMsg is called to add
-   * the new PersonalMessage to this.messages, and to save the unapproved PersonalMessages from that list to
-   * this.memStore.
-   *
-   * @param {object} msgParams - The params for the eth_sign call to be made after the message is approved.
-   * @param {object} [req] - The original request object possibly containing the origin
-   * @returns {promise} When the message has been signed or rejected
-   */
-  addUnapprovedMessageAsync(msgParams, req) {
-    return new Promise((resolve, reject) => {
-      if (!msgParams.from) {
-        reject(
-          new Error('MetaMask Message Signature: from field is required.'),
-        );
-        return;
-      }
-      this.addUnapprovedMessage(msgParams, req).then((msgId) => {
-        this.once(`${msgId}:finished`, (data) => {
-          switch (data.status) {
-            case 'signed':
-              resolve(data.rawSig);
-              return;
-            case 'rejected':
-              reject(
-                ethErrors.provider.userRejectedRequest(
-                  'MetaMask Message Signature: User denied message signature.',
-                ),
-              );
-              return;
-            case 'errored':
-              reject(new Error(`MetaMask Message Signature: ${data.error}`));
-              return;
-            default:
-              reject(
-                new Error(
-                  `MetaMask Message Signature: Unknown problem: ${JSON.stringify(
-                    msgParams,
-                  )}`,
-                ),
-              );
-          }
-        });
-      });
-    });
-  }
-
-  /**
-   * Creates a new PersonalMessage with an 'unapproved' status using the passed msgParams. this.addMsg is called to add
-   * the new PersonalMessage to this.messages, and to save the unapproved PersonalMessages from that list to
-   * this.memStore.
-   *
-   * @param {object} msgParams - The params for the eth_sign call to be made after the message is approved.
-   * @param {object} [req] - The original request object possibly containing the origin
-   * @returns {number} The id of the newly created PersonalMessage.
-   */
-  async addUnapprovedMessage(msgParams, req) {
-    log.debug(
-      `PersonalMessageManager addUnapprovedMessage: ${JSON.stringify(
-        msgParams,
-      )}`,
-    );
-    // add origin from request
-    if (req) {
-      msgParams.origin = req.origin;
-    }
-    msgParams.data = this.normalizeMsgData(msgParams.data);
-
-    // check for SIWE message
-    const siwe = detectSIWE(msgParams);
-    msgParams.siwe = siwe;
-
-    // create txData obj with parameters and meta data
-    const time = new Date().getTime();
-    const msgId = createId();
-    const msgData = {
-      id: msgId,
-      msgParams,
-      time,
-      status: 'unapproved',
-      type: MESSAGE_TYPE.PERSONAL_SIGN,
-    };
-    this.addMsg(msgData);
-
-    const securityProviderResponse = await this.securityProviderRequest(
-      msgData,
-      msgData.type,
-    );
-
-    msgData.securityProviderResponse = securityProviderResponse;
-
-    // signal update
-    this.emit('update');
-    return msgId;
-  }
-
-  /**
-   * Adds a passed PersonalMessage to this.messages, and calls this._saveMsgList() to save the unapproved PersonalMessages from that
-   * list to this.memStore.
-   *
-   * @param {Message} msg - The PersonalMessage to add to this.messages
-   */
-  addMsg(msg) {
-    this.messages.push(msg);
-    this._saveMsgList();
-  }
-
-  /**
-   * Returns a specified PersonalMessage.
-   *
-   * @param {number} msgId - The id of the PersonalMessage to get
-   * @returns {PersonalMessage|undefined} The PersonalMessage with the id that matches the passed msgId, or undefined
-   * if no PersonalMessage has that id.
-   */
-  getMsg(msgId) {
-    return this.messages.find((msg) => msg.id === msgId);
-  }
-
-  /**
-   * Approves a PersonalMessage. Sets the message status via a call to this.setMsgStatusApproved, and returns a promise
-   * with any the message params modified for proper signing.
-   *
-   * @param {object} msgParams - The msgParams to be used when eth_sign is called, plus data added by MetaMask.
-   * @param {object} msgParams.metamaskId - Added to msgParams for tracking and identification within MetaMask.
-   * @returns {Promise<object>} Promises the msgParams object with metamaskId removed.
-   */
-  approveMessage(msgParams) {
-    this.setMsgStatusApproved(msgParams.metamaskId);
-    return this.prepMsgForSigning(msgParams);
-  }
-
-  /**
-   * Sets a PersonalMessage status to 'approved' via a call to this._setMsgStatus.
-   *
-   * @param {number} msgId - The id of the PersonalMessage to approve.
-   */
-  setMsgStatusApproved(msgId) {
-    this._setMsgStatus(msgId, 'approved');
-  }
-
-  /**
-   * Sets a PersonalMessage status to 'signed' via a call to this._setMsgStatus and updates that PersonalMessage in
-   * this.messages by adding the raw signature data of the signature request to the PersonalMessage
-   *
-   * @param {number} msgId - The id of the PersonalMessage to sign.
-   * @param {buffer} rawSig - The raw data of the signature request
-   */
-  setMsgStatusSigned(msgId, rawSig) {
-    const msg = this.getMsg(msgId);
-    msg.rawSig = rawSig;
-    this._updateMsg(msg);
-    this._setMsgStatus(msgId, 'signed');
-  }
-
-  /**
-   * Removes the metamaskId property from passed msgParams and returns a promise which resolves the updated msgParams
-   *
-   * @param {object} msgParams - The msgParams to modify
-   * @returns {Promise<object>} Promises the msgParams with the metamaskId property removed
-   */
-  async prepMsgForSigning(msgParams) {
-    delete msgParams.metamaskId;
-    return msgParams;
-  }
-
-  /**
-   * Sets a PersonalMessage status to 'rejected' via a call to this._setMsgStatus.
-   *
-   * @param {number} msgId - The id of the PersonalMessage to reject.
-   * @param reason
-   */
-  rejectMsg(msgId, reason = undefined) {
-    if (reason) {
-      const msg = this.getMsg(msgId);
-      this.metricsEvent({
-        event: reason,
-        category: EVENT.CATEGORIES.TRANSACTIONS,
-        properties: {
-          action: 'Sign Request',
-          type: msg.type,
-        },
-      });
-    }
-    this._setMsgStatus(msgId, 'rejected');
-  }
-
-  /**
-   * Sets a Message status to 'errored' via a call to this._setMsgStatus.
-   *
-   * @param {number} msgId - The id of the Message to error
-   * @param error
-   */
-  errorMessage(msgId, error) {
-    const msg = this.getMsg(msgId);
-    msg.error = error;
-    this._updateMsg(msg);
-    this._setMsgStatus(msgId, 'errored');
-  }
-
-  /**
-   * Clears all unapproved messages from memory.
-   */
-  clearUnapproved() {
-    this.messages = this.messages.filter((msg) => msg.status !== 'unapproved');
-    this._saveMsgList();
-  }
-
-  /**
-   * Updates the status of a PersonalMessage in this.messages via a call to this._updateMsg
-   *
-   * @private
-   * @param {number} msgId - The id of the PersonalMessage to update.
-   * @param {string} status - The new status of the PersonalMessage.
-   * @throws A 'PersonalMessageManager - PersonalMessage not found for id: "${msgId}".' if there is no PersonalMessage
-   * in this.messages with an id equal to the passed msgId
-   * @fires An event with a name equal to `${msgId}:${status}`. The PersonalMessage is also fired.
-   * @fires If status is 'rejected' or 'signed', an event with a name equal to `${msgId}:finished` is fired along
-   * with the PersonalMessage
-   */
-  _setMsgStatus(msgId, status) {
-    const msg = this.getMsg(msgId);
-    if (!msg) {
-      throw new Error(
-        `PersonalMessageManager - Message not found for id: "${msgId}".`,
-      );
-    }
-    msg.status = status;
-    this._updateMsg(msg);
-    this.emit(`${msgId}:${status}`, msg);
-    if (status === 'rejected' || status === 'signed') {
-      this.emit(`${msgId}:finished`, msg);
-    }
-  }
-
-  /**
-   * Sets a PersonalMessage in this.messages to the passed PersonalMessage if the ids are equal. Then saves the
-   * unapprovedPersonalMsgs index to storage via this._saveMsgList
-   *
-   * @private
-   * @param {PersonalMessage} msg - A PersonalMessage that will replace an existing PersonalMessage (with the same
-   * id) in this.messages
-   */
-  _updateMsg(msg) {
-    const index = this.messages.findIndex((message) => message.id === msg.id);
-    if (index !== -1) {
-      this.messages[index] = msg;
-    }
-    this._saveMsgList();
-  }
-
-  /**
-   * Saves the unapproved PersonalMessages, and their count, to this.memStore
-   *
-   * @private
-   * @fires 'updateBadge'
-   */
-  _saveMsgList() {
-    const unapprovedPersonalMsgs = this.getUnapprovedMsgs();
-    const unapprovedPersonalMsgCount = Object.keys(
-      unapprovedPersonalMsgs,
-    ).length;
-    this.memStore.updateState({
-      unapprovedPersonalMsgs,
-      unapprovedPersonalMsgCount,
-    });
-    this.emit(METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE);
-  }
-
-  /**
-   * A helper function that converts raw buffer data to a hex, or just returns the data if it is already formatted as a hex.
-   *
-   * @param {any} data - The buffer data to convert to a hex
-   * @returns {string} A hex string conversion of the buffer data
-   */
-  normalizeMsgData(data) {
-    try {
-      const stripped = stripHexPrefix(data);
-      if (stripped.match(hexRe)) {
-        return addHexPrefix(stripped);
-      }
-    } catch (e) {
-      log.debug(`Message was not hex encoded, interpreting as utf8.`);
-    }
-
-    return bufferToHex(Buffer.from(data, 'utf8'));
-  }
-}
diff --git a/app/scripts/lib/personal-message-manager.test.js b/app/scripts/lib/personal-message-manager.test.js
deleted file mode 100644
index e565c0229..000000000
--- a/app/scripts/lib/personal-message-manager.test.js
+++ /dev/null
@@ -1,182 +0,0 @@
-import { TransactionStatus } from '../../../shared/constants/transaction';
-import PersonalMessageManager from './personal-message-manager';
-
-describe('Personal Message Manager', () => {
-  let messageManager;
-
-  beforeEach(() => {
-    messageManager = new PersonalMessageManager({
-      metricsEvent: jest.fn(),
-      securityProviderRequest: jest.fn(),
-    });
-  });
-
-  describe('#getMsgList', () => {
-    it('when new should return empty array', () => {
-      const result = messageManager.messages;
-      expect(Array.isArray(result)).toStrictEqual(true);
-      expect(result).toHaveLength(0);
-    });
-  });
-
-  describe('#addMsg', () => {
-    it('adds a Msg returned in getMsgList', () => {
-      const Msg = {
-        id: 1,
-        status: TransactionStatus.approved,
-        metamaskNetworkId: 'unit test',
-      };
-      messageManager.addMsg(Msg);
-      const result = messageManager.messages;
-      expect(Array.isArray(result)).toStrictEqual(true);
-      expect(result).toHaveLength(1);
-      expect(result[0].id).toStrictEqual(1);
-    });
-  });
-
-  describe('#setMsgStatusApproved', () => {
-    it('sets the Msg status to approved', () => {
-      const Msg = {
-        id: 1,
-        status: TransactionStatus.unapproved,
-        metamaskNetworkId: 'unit test',
-      };
-      messageManager.addMsg(Msg);
-      messageManager.setMsgStatusApproved(1);
-      const result = messageManager.messages;
-      expect(Array.isArray(result)).toStrictEqual(true);
-      expect(result).toHaveLength(1);
-      expect(result[0].status).toStrictEqual(TransactionStatus.approved);
-    });
-  });
-
-  describe('#rejectMsg', () => {
-    it('sets the Msg status to rejected', () => {
-      const Msg = {
-        id: 1,
-        status: TransactionStatus.unapproved,
-        metamaskNetworkId: 'unit test',
-      };
-      messageManager.addMsg(Msg);
-      messageManager.rejectMsg(1);
-      const result = messageManager.messages;
-      expect(Array.isArray(result)).toStrictEqual(true);
-      expect(result).toHaveLength(1);
-      expect(result[0].status).toStrictEqual(TransactionStatus.rejected);
-    });
-  });
-
-  describe('#_updateMsg', () => {
-    it('replaces the Msg with the same id', () => {
-      messageManager.addMsg({
-        id: '1',
-        status: TransactionStatus.unapproved,
-        metamaskNetworkId: 'unit test',
-      });
-      messageManager.addMsg({
-        id: '2',
-        status: TransactionStatus.approved,
-        metamaskNetworkId: 'unit test',
-      });
-      messageManager._updateMsg({
-        id: '1',
-        status: 'blah',
-        hash: 'foo',
-        metamaskNetworkId: 'unit test',
-      });
-      const result = messageManager.getMsg('1');
-      expect(result.hash).toStrictEqual('foo');
-    });
-  });
-
-  describe('#getUnapprovedMsgs', () => {
-    it('returns unapproved Msgs in a hash', () => {
-      messageManager.addMsg({
-        id: '1',
-        status: TransactionStatus.unapproved,
-        metamaskNetworkId: 'unit test',
-      });
-      messageManager.addMsg({
-        id: '2',
-        status: TransactionStatus.approved,
-        metamaskNetworkId: 'unit test',
-      });
-      const result = messageManager.getUnapprovedMsgs();
-      expect(typeof result).toStrictEqual('object');
-      expect(result['1'].status).toStrictEqual(TransactionStatus.unapproved);
-      expect(result['2']).toBeUndefined();
-    });
-  });
-
-  describe('#getMsg', () => {
-    it('returns a Msg with the requested id', () => {
-      messageManager.addMsg({
-        id: '1',
-        status: TransactionStatus.unapproved,
-        metamaskNetworkId: 'unit test',
-      });
-      messageManager.addMsg({
-        id: '2',
-        status: TransactionStatus.approved,
-        metamaskNetworkId: 'unit test',
-      });
-      expect(messageManager.getMsg('1').status).toStrictEqual(
-        TransactionStatus.unapproved,
-      );
-      expect(messageManager.getMsg('2').status).toStrictEqual(
-        TransactionStatus.approved,
-      );
-    });
-  });
-
-  describe('#normalizeMsgData', () => {
-    it('converts text to a utf8 hex string', () => {
-      const input = 'hello';
-      const output = messageManager.normalizeMsgData(input);
-      expect(output).toStrictEqual('0x68656c6c6f');
-    });
-
-    it('tolerates a hex prefix', () => {
-      const input = '0x12';
-      const output = messageManager.normalizeMsgData(input);
-      expect(output).toStrictEqual('0x12');
-    });
-
-    it('tolerates normal hex', () => {
-      const input = '12';
-      const output = messageManager.normalizeMsgData(input);
-      expect(output).toStrictEqual('0x12');
-    });
-  });
-
-  describe('#addUnapprovedMessage', () => {
-    const origin = 'http://localhost:8080';
-    const from = '0xFb2C15004343904e5f4082578c4e8e11105cF7e3';
-    const msgParams = {
-      from,
-      data: '0x6c6f63616c686f73743a383038302077616e747320796f7520746f207369676e20696e207769746820796f757220457468657265756d206163636f756e743a0a3078466232433135303034333433393034653566343038323537386334653865313131303563463765330a0a436c69636b20746f207369676e20696e20616e642061636365707420746865205465726d73206f6620536572766963653a2068747470733a2f2f636f6d6d756e6974792e6d6574616d61736b2e696f2f746f730a0a5552493a20687474703a2f2f6c6f63616c686f73743a383038300a56657273696f6e3a20310a436861696e2049443a20310a4e6f6e63653a2053544d74364b514d7777644f58453330360a4973737565642041743a20323032322d30332d31385432313a34303a34302e3832335a0a5265736f75726365733a0a2d20697066733a2f2f516d653773733341525667787636725871565069696b4d4a3875324e4c676d67737a673133705972444b456f69750a2d2068747470733a2f2f6578616d706c652e636f6d2f6d792d776562322d636c61696d2e6a736f6e',
-    };
-
-    it('should detect SIWE messages', async () => {
-      const request = { origin };
-      const nonSiweMsgParams = {
-        from,
-        data: '0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0',
-      };
-      // siwe message
-      const msgId = await messageManager.addUnapprovedMessage(
-        msgParams,
-        request,
-      );
-      const result = messageManager.getMsg(msgId);
-      expect(result.msgParams.siwe.isSIWEMessage).toStrictEqual(true);
-      // non-siwe message
-      const msgId2 = await messageManager.addUnapprovedMessage(
-        nonSiweMsgParams,
-        request,
-      );
-      const result2 = messageManager.getMsg(msgId2);
-      expect(result2.msgParams.siwe.isSIWEMessage).toStrictEqual(false);
-    });
-  });
-});

From 1eb102fd964952d5d2b9a53070b0c868cbfe59bd Mon Sep 17 00:00:00 2001
From: Danica Shen <zhaodanica@gmail.com>
Date: Wed, 22 Mar 2023 15:43:03 +0000
Subject: [PATCH 048/129] Fix(18190): add tabs to permission when initializing
 app (#18218)

---
 app/manifest/v2/_base.json   | 14 --------------
 app/manifest/v2/chrome.json  | 16 +++++++++++++++-
 app/manifest/v2/firefox.json | 17 ++++++++++++++++-
 app/manifest/v3/_base.json   | 10 ----------
 app/manifest/v3/chrome.json  | 16 +++++++++++++++-
 app/manifest/v3/firefox.json | 17 ++++++++++++++++-
 6 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/app/manifest/v2/_base.json b/app/manifest/v2/_base.json
index f962de618..39b289197 100644
--- a/app/manifest/v2/_base.json
+++ b/app/manifest/v2/_base.json
@@ -60,19 +60,5 @@
   },
   "manifest_version": 2,
   "name": "__MSG_appName__",
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://*.codefi.network/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "activeTab",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ],
   "short_name": "__MSG_appName__"
 }
diff --git a/app/manifest/v2/chrome.json b/app/manifest/v2/chrome.json
index a152130d8..9c0e95ec5 100644
--- a/app/manifest/v2/chrome.json
+++ b/app/manifest/v2/chrome.json
@@ -4,5 +4,19 @@
     "matches": ["https://metamask.io/*"],
     "ids": ["*"]
   },
-  "minimum_chrome_version": "80"
+  "minimum_chrome_version": "80",
+  "permissions": [
+    "storage",
+    "unlimitedStorage",
+    "clipboardWrite",
+    "http://localhost:8545/",
+    "https://*.infura.io/",
+    "https://*.codefi.network/",
+    "https://chainid.network/chains.json",
+    "https://lattice.gridplus.io/*",
+    "activeTab",
+    "webRequest",
+    "*://*.eth/",
+    "notifications"
+  ]
 }
diff --git a/app/manifest/v2/firefox.json b/app/manifest/v2/firefox.json
index d50b26a27..5adf04713 100644
--- a/app/manifest/v2/firefox.json
+++ b/app/manifest/v2/firefox.json
@@ -4,5 +4,20 @@
       "id": "webextension@metamask.io",
       "strict_min_version": "78.0"
     }
-  }
+  },
+  "permissions": [
+    "storage",
+    "unlimitedStorage",
+    "clipboardWrite",
+    "http://localhost:8545/",
+    "https://*.infura.io/",
+    "https://*.codefi.network/",
+    "https://chainid.network/chains.json",
+    "https://lattice.gridplus.io/*",
+    "activeTab",
+    "tabs",
+    "webRequest",
+    "*://*.eth/",
+    "notifications"
+  ]
 }
diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json
index 1b9456fd8..3beeb7379 100644
--- a/app/manifest/v3/_base.json
+++ b/app/manifest/v3/_base.json
@@ -65,15 +65,5 @@
   },
   "manifest_version": 3,
   "name": "__MSG_appName__",
-  "permissions": [
-    "activeTab",
-    "alarms",
-    "clipboardWrite",
-    "notifications",
-    "scripting",
-    "storage",
-    "unlimitedStorage",
-    "webRequest"
-  ],
   "short_name": "__MSG_appName__"
 }
diff --git a/app/manifest/v3/chrome.json b/app/manifest/v3/chrome.json
index 486692539..dbb0ee22c 100644
--- a/app/manifest/v3/chrome.json
+++ b/app/manifest/v3/chrome.json
@@ -6,5 +6,19 @@
     "matches": ["https://metamask.io/*"],
     "ids": ["*"]
   },
-  "minimum_chrome_version": "80"
+  "minimum_chrome_version": "80",
+  "permissions": [
+    "storage",
+    "unlimitedStorage",
+    "clipboardWrite",
+    "http://localhost:8545/",
+    "https://*.infura.io/",
+    "https://*.codefi.network/",
+    "https://chainid.network/chains.json",
+    "https://lattice.gridplus.io/*",
+    "activeTab",
+    "webRequest",
+    "*://*.eth/",
+    "notifications"
+  ]
 }
diff --git a/app/manifest/v3/firefox.json b/app/manifest/v3/firefox.json
index 5f0e5672f..67ecf7b09 100644
--- a/app/manifest/v3/firefox.json
+++ b/app/manifest/v3/firefox.json
@@ -22,5 +22,20 @@
     "default_title": "MetaMask",
     "default_popup": "popup.html"
   },
-  "manifest_version": 2
+  "manifest_version": 2,
+  "permissions": [
+    "storage",
+    "unlimitedStorage",
+    "clipboardWrite",
+    "http://localhost:8545/",
+    "https://*.infura.io/",
+    "https://*.codefi.network/",
+    "https://chainid.network/chains.json",
+    "https://lattice.gridplus.io/*",
+    "tabs",
+    "activeTab",
+    "webRequest",
+    "*://*.eth/",
+    "notifications"
+  ]
 }

From 16fa967740d0903a1e4c630692d269bffa9e9d7b Mon Sep 17 00:00:00 2001
From: vthomas13 <10986371+vthomas13@users.noreply.github.com>
Date: Wed, 22 Mar 2023 12:51:37 -0400
Subject: [PATCH 049/129] Revert "What's new - OpenSea security provider
 (#16831)" (#17968)

This reverts commit 932282e638902621fd40d297c840dbf175ca8885.
---
 app/_locales/de/messages.json                 |  21 ---
 app/_locales/el/messages.json                 |  21 ---
 app/_locales/en/messages.json                 |  21 ---
 app/_locales/es/messages.json                 |  21 ---
 app/_locales/fr/messages.json                 |  21 ---
 app/_locales/hi/messages.json                 |  21 ---
 app/_locales/id/messages.json                 |  21 ---
 app/_locales/ja/messages.json                 |  21 ---
 app/_locales/ko/messages.json                 |  21 ---
 app/_locales/pt/messages.json                 |  21 ---
 app/_locales/ru/messages.json                 |  21 ---
 app/_locales/tl/messages.json                 |  21 ---
 app/_locales/tr/messages.json                 |  21 ---
 app/_locales/vi/messages.json                 |  21 ---
 app/_locales/zh_CN/messages.json              |  21 ---
 app/images/open-sea-security-provider.svg     |  91 -------------
 app/scripts/controllers/preferences.js        |  11 --
 app/scripts/controllers/preferences.test.js   |  24 ----
 app/scripts/metamask-controller.js            |   4 -
 test/e2e/fixture-builder.js                   |   4 -
 .../app/open-sea-whats-new-popover/index.js   |   1 -
 .../app/open-sea-whats-new-popover/index.scss |   6 -
 .../open-sea-whats-new-popover.js             | 124 ------------------
 ui/pages/home/home.component.js               |   2 -
 ui/selectors/selectors.js                     |   6 -
 ui/store/actions.ts                           |  16 +--
 26 files changed, 1 insertion(+), 603 deletions(-)
 delete mode 100644 app/images/open-sea-security-provider.svg
 delete mode 100644 ui/components/app/open-sea-whats-new-popover/index.js
 delete mode 100644 ui/components/app/open-sea-whats-new-popover/index.scss
 delete mode 100644 ui/components/app/open-sea-whats-new-popover/open-sea-whats-new-popover.js

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index a92a7de6a..a920e0116 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -329,9 +329,6 @@
     "message": "$1 erlauben, bis zu dem folgenden Betrag abzuheben und auszugeben:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Gehen Sie immer mit Sorgfalt vor, bevor Sie irgendwelche Anfragen genehmigen."
-  },
   "amount": {
     "message": "Betrag"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Verwenden Sie die OpenSea's API, um NFT-Daten abzurufen. Die NFT-Auto-Erkennung basiert auf der OpenSea's API und wird nicht verfügbar sein, wenn diese deaktiviert ist."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Sicherheitsanbieter aktivieren"
-  },
   "enableSmartTransactions": {
     "message": "Intelligente Transaktionen ermöglichen"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "Allgemein"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Erhalten Sie Warnungen von OpenSea, wenn Sie eine bekannte bösartige Anfrage erhalten."
-  },
   "goBack": {
     "message": "Zurück"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "Nicht genügend Gas"
   },
-  "notNow": {
-    "message": "Nicht jetzt"
-  },
   "notifications": {
     "message": "Benachrichtigungen"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (Beta)"
   },
-  "openSeaAltText": {
-    "message": "OpenSea-Sicherheitsanbieter"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea ist der erset Sicherheitsanbieter für diese Funktion. Mehr Anbieter folgen in Kürze!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "Nicht verbunden"
   },
-  "staySafeWithOpenSea": {
-    "message": "Mit OpenSea sicher bleiben"
-  },
   "step1LatticeWallet": {
     "message": "Verbinden Sie Ihr Lattice1"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index bb17e4e33..6a97d9d71 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -329,9 +329,6 @@
     "message": "Επιτρέψτε στο $1 να κάνει ανάληψη και να ξοδέψει μέχρι το ακόλουθο ποσό:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Φροντίστε πάντα να κάνετε τη δική σας επιμελή έρευνα προτού εγκρίνετε οποιαδήποτε αιτήματα."
-  },
   "amount": {
     "message": "Ποσό"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Χρησιμοποιήστε το API OpenSea για λήψη δεδομένων NFT. Η αυτόματη ανίχνευση NFT βασίζεται στο API του OpenSea, και δεν θα είναι διαθέσιμη όταν αυτό είναι απενεργοποιημένο."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Ενεργοποίηση παρόχου ασφάλειας"
-  },
   "enableSmartTransactions": {
     "message": "Ενεργοποίηση Έξυπνων Συναλλαγών"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "Γενικά"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Λάβετε προειδοποιήσεις από το OpenSea όποτε λαβαίνετε ένα αναγνωρισμένο κακόβουλο αίτημα."
-  },
   "goBack": {
     "message": "Μετάβαση Πίσω"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "Δεν Υπάρχει Αρκετό τέλος συναλλαγής"
   },
-  "notNow": {
-    "message": "Όχι τώρα"
-  },
   "notifications": {
     "message": "Ειδοποιήσεις"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (Beta)"
   },
-  "openSeaAltText": {
-    "message": "Πάροχος ασφάλειας OpenSea"
-  },
-  "openSeaDescription": {
-    "message": "Το OpenSea είναι ο πρώτος πάροχος ασφάλειας για αυτή τη λειτουργία. Σύντομα θα προστεθούν και άλλοι πάροχοι!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "Δεν έχει συνδεθεί"
   },
-  "staySafeWithOpenSea": {
-    "message": "Μείνετε ασφαλείς με το OpenSea"
-  },
   "step1LatticeWallet": {
     "message": "Συνδέστε το Lattice1 σας"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index ccaa85c05..1aca00b81 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -342,9 +342,6 @@
     "message": "Allow $1 to withdraw and spend up to the following amount:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Always be sure to do your own due diligence before approving any requests."
-  },
   "amount": {
     "message": "Amount"
   },
@@ -1249,9 +1246,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Use OpenSea's API to fetch NFT data. NFT auto-detection relies on OpenSea's API, and will not be available when this is turned off."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Enable security provider"
-  },
   "enableSmartTransactions": {
     "message": "Enable smart transactions"
   },
@@ -1555,9 +1549,6 @@
   "general": {
     "message": "General"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Get warnings from OpenSea whenever you receive a known malicious request."
-  },
   "goBack": {
     "message": "Go back"
   },
@@ -2332,9 +2323,6 @@
   "notEnoughGas": {
     "message": "Not enough gas"
   },
-  "notNow": {
-    "message": "Not now"
-  },
   "notifications": {
     "message": "Notifications"
   },
@@ -2695,12 +2683,6 @@
   "openSea": {
     "message": "OpenSea (Beta)"
   },
-  "openSeaAltText": {
-    "message": "OpenSea security provider"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea is the first security provider for this feature. More providers coming soon!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3709,9 +3691,6 @@
   "statusNotConnected": {
     "message": "Not connected"
   },
-  "staySafeWithOpenSea": {
-    "message": "Stay safe with OpenSea"
-  },
   "step1LatticeWallet": {
     "message": "Connect your Lattice1"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index e987868a4..a2dc1a9fe 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -329,9 +329,6 @@
     "message": "Permitir que se retire $1 y gastar hasta el siguiente importe:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Asegúrese siempre de hacer su propia diligencia debida antes de aprobar cualquier solicitud."
-  },
   "amount": {
     "message": "Importe"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Utilice la API de OpenSea para obtener los datos de NFT. La autodetección de NFT depende de la API de OpenSea y no estará disponible si la API está desactivada."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Habilitar proveedor de seguridad"
-  },
   "enableSmartTransactions": {
     "message": "Habilitar transacciones inteligentes"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "General"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Reciba advertencias de OpenSea cada vez que reciba una solicitud maliciosa conocida."
-  },
   "goBack": {
     "message": "Volver"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "No hay gas suficiente"
   },
-  "notNow": {
-    "message": "Por ahora no"
-  },
   "notifications": {
     "message": "Notificaciones"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (Beta)"
   },
-  "openSeaAltText": {
-    "message": "Proveedor de seguridad de OpenSea"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea es el primer proveedor de seguridad para esta función. ¡Más proveedores próximamente!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "No conectado"
   },
-  "staySafeWithOpenSea": {
-    "message": "Manténgase seguro con OpenSea"
-  },
   "step1LatticeWallet": {
     "message": "Conecte su Lattice1"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index e2f21611a..1906a3a1f 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -329,9 +329,6 @@
     "message": "Permettre à $1 de retirer et de dépenser jusqu’au montant suivant :",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Vous devez faire preuve de diligence raisonnable avant d’approuver toute demande."
-  },
   "amount": {
     "message": "Montant"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Utilisez l’API OpenSea pour récupérer les données de NFT. La détection automatique de NFT repose sur l’API OpenSea et ne sera pas disponible si elle est désactivée."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Activer le fournisseur de services de sécurité"
-  },
   "enableSmartTransactions": {
     "message": "Activer les transactions intelligentes"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "Général"
   },
-  "getWarningsFromOpenSea": {
-    "message": "OpenSea vous avertira dès que vous recevrez une requête malveillante."
-  },
   "goBack": {
     "message": "Retour"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "Pas assez de gaz"
   },
-  "notNow": {
-    "message": "Pas maintenant"
-  },
   "notifications": {
     "message": "Notifications"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (Beta)"
   },
-  "openSeaAltText": {
-    "message": "Fournisseur de services de sécurité OpenSea"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea est le premier fournisseur de services de sécurité à offrir cette fonctionnalité. D’autres fournisseurs seront bientôt ajoutés !"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "Non connecté"
   },
-  "staySafeWithOpenSea": {
-    "message": "Restez en sécurité avec OpenSea"
-  },
   "step1LatticeWallet": {
     "message": "Connectez votre Lattice1"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 2c2da2a6e..03307179f 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -329,9 +329,6 @@
     "message": "$1 को निम्नलिखित तक राशि निकालने और खर्च करने की अनुमति दें:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "किसी भी अनुरोध को मंजूरी देने से पहले हमेशा अपनी खुद की उचित कर्मठता सुनिश्चित करें।"
-  },
   "amount": {
     "message": "राशि"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "NFT डेटा लाने के लिए OpenSea के API का उपयोग करें। NFT ऑटो-डिटेक्शन OpenSea के API पर निर्भर करता है, और इसके बंद होने पर उपलब्ध नहीं होगा।"
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "सुरक्षा प्रदाता सक्षम करें"
-  },
   "enableSmartTransactions": {
     "message": "स्मार्ट लेनदेन को सक्षम करें"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "सामान्य"
   },
-  "getWarningsFromOpenSea": {
-    "message": "जब भी आप एक ज्ञात दुर्भावनापूर्ण अनुरोध प्राप्त करते हैं, OpenSea से चेतावनी प्राप्त करें।"
-  },
   "goBack": {
     "message": "वापस जाएं"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "पर्याप्त गैस नहीं"
   },
-  "notNow": {
-    "message": "अभी नहीं"
-  },
   "notifications": {
     "message": "सूचनाएं"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (बीटा)"
   },
-  "openSeaAltText": {
-    "message": "OpenSea सुरक्षा प्रदाता"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea इस सुविधा के लिए पहला सुरक्षा प्रदाता है।अधिक प्रदाता जल्द ही आ रहे हैं!"
-  },
   "openSeaNew": {
     "message": "ओपनसी"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "कनेक्ट नहीं है"
   },
-  "staySafeWithOpenSea": {
-    "message": "OpenSea के साथ सुरक्षित रहें"
-  },
   "step1LatticeWallet": {
     "message": "अपना Lattice1 कनेक्ट करें"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 370ffdf72..07aae2ce0 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -329,9 +329,6 @@
     "message": "Izinkan $1 untuk ditarik dan digunakan hingga jumlah berikut:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Selalu pastikan untuk melakukan uji tuntas Anda sendiri sebelum menyetujui permintaan apa pun."
-  },
   "amount": {
     "message": "Jumlah"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Gunakan API OpenSea untuk mengambil data NFT. Deteksi otomatis NFT bergantung pada API OpenSea, dan tidak akan tersedia saat API ditutup."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Aktifkan penyedia keamanan"
-  },
   "enableSmartTransactions": {
     "message": "Aktifkan transaksi pintar"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "Umum"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Dapatkan peringatan dari OpenSea setiap kali Anda menerima permintaan berbahaya yang diketahui."
-  },
   "goBack": {
     "message": "Kembali"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "Gas tidak cukup"
   },
-  "notNow": {
-    "message": "Tidak sekarang"
-  },
   "notifications": {
     "message": "Notifikasi"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (Beta)"
   },
-  "openSeaAltText": {
-    "message": "Penyedia keamanan OpenSea"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea merupakan penyedia keamanan pertama untuk fitur ini. Penyedia lainnya akan segera hadir!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "Tidak terhubung"
   },
-  "staySafeWithOpenSea": {
-    "message": "Tetap aman bersama OpenSea"
-  },
   "step1LatticeWallet": {
     "message": "Hubungkan Lattice1 Anda"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 57d53796f..3320c1442 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -329,9 +329,6 @@
     "message": "$1に以下の額までの引き出しと使用を許可します。",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "リクエストを承認する前に、必ず独自のデューデリジェンスを行ってください。"
-  },
   "amount": {
     "message": "金額"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "OpenSea APIを使用してNFTデータを取得します。NFT自動検出はOpenSea APIを使用するため、この設定をオフにすると利用できなくなります。"
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "セキュリティプロバイダーを有効にする"
-  },
   "enableSmartTransactions": {
     "message": "スマートトランザクションを有効にする"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "一般"
   },
-  "getWarningsFromOpenSea": {
-    "message": "既知の悪質なリクエストを受けた際に OpenSea から警告を受けられます。"
-  },
   "goBack": {
     "message": "戻る"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "ガスが不足しています"
   },
-  "notNow": {
-    "message": "また後で"
-  },
   "notifications": {
     "message": "通知"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (ベータ)"
   },
-  "openSeaAltText": {
-    "message": "OpenSea セキュリティプロバイダー"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea は、この機能を提供する最初のセキュリティプロバイダーです。他のプロバイダーも近日追加予定です！"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "未接続"
   },
-  "staySafeWithOpenSea": {
-    "message": "OpenSea で安全を確保"
-  },
   "step1LatticeWallet": {
     "message": "Lattice1を接続する"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 2826089ef..01f792772 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -329,9 +329,6 @@
     "message": "$1에서 다음 금액까지 인출 및 지출하도록 허용:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "모든 요청을 승인하기 전에 주의 깊게 직접 확인하세요."
-  },
   "amount": {
     "message": "금액"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "OpenSea의 API를 사용하여 NFT 데이터를 가져옵니다. NFT 자동 감지는 OpenSea의 API에 의존하며 이 API가 꺼져 있으면 사용할 수 없습니다."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "보안 업체 활성화"
-  },
   "enableSmartTransactions": {
     "message": "스마트 트랜잭션 활성화"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "일반"
   },
-  "getWarningsFromOpenSea": {
-    "message": "알려진 악성 요청을 받을 때마다 OpenSea로부터 경고 알림을 받으세요."
-  },
   "goBack": {
     "message": "뒤로 가기"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "가스 부족"
   },
-  "notNow": {
-    "message": "나중에"
-  },
   "notifications": {
     "message": "알림"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (베타)"
   },
-  "openSeaAltText": {
-    "message": "OpenSea 보안 업체"
-  },
-  "openSeaDescription": {
-    "message": "이 기능의 1차 보안 업체는 OpenSea입니다. 곧 다른 보안 업체도 마련하겠습니다!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "연결되지 않음"
   },
-  "staySafeWithOpenSea": {
-    "message": "OpenSea로 보안을 유지하세요"
-  },
   "step1LatticeWallet": {
     "message": "Lattice1을 연결하세요."
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 46fc9910f..544cc1998 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -329,9 +329,6 @@
     "message": "Permitir que $1 saque e gaste até o seguinte valor:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Certifique-se sempre de fazer sua devida diligência antes de aprovar qualquer solicitação."
-  },
   "amount": {
     "message": "Valor"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Use a API OpenSea para recuperar dados de NFTs. A detecção automática de NFTs depende da API OpenSea e não estará disponível quando essa opção estiver desativada."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Habilitar provedor de segurança"
-  },
   "enableSmartTransactions": {
     "message": "Ativar transações inteligentes"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "Geral"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Receba avisos do OpenSea sempre que receber uma solicitação maliciosa conhecida."
-  },
   "goBack": {
     "message": "Voltar"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "Não há gás suficiente"
   },
-  "notNow": {
-    "message": "Agora não"
-  },
   "notifications": {
     "message": "Notificações"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (Beta)"
   },
-  "openSeaAltText": {
-    "message": "Provedor de segurança OpenSea"
-  },
-  "openSeaDescription": {
-    "message": "O OpenSea é o primeiro provedor de segurança para este recurso. Mais provedores chegarão em breve!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "Não conectado"
   },
-  "staySafeWithOpenSea": {
-    "message": "Fique seguro com o OpenSea"
-  },
   "step1LatticeWallet": {
     "message": "Conecte seu Lattice1"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index d906e91fe..89293012d 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -329,9 +329,6 @@
     "message": "Разрешить $1 снять и потратить до следующей суммы:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Всегда обязательно проводите собственную комплексную проверку, прежде чем утверждать какие-либо запросы."
-  },
   "amount": {
     "message": "Сумма"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Используйте API OpenSea для получения данных NFT. Для автоматического обнаружения NFT используется API OpenSea, и такое обнаружение будет недоступно, если этот API отключен."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Включить поставщика услуг безопасности"
-  },
   "enableSmartTransactions": {
     "message": "Включить смарт-транзакции"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "Общее"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Получайте предупреждения от OpenSea всякий раз, когда вы получаете заведомо вредоносный запрос."
-  },
   "goBack": {
     "message": "Назад"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "Недостаточно газа"
   },
-  "notNow": {
-    "message": "Не сейчас"
-  },
   "notifications": {
     "message": "Уведомления"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (бета-версия)"
   },
-  "openSeaAltText": {
-    "message": "Поставщик услуг безопасности OpenSea"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea является первым поставщиком услуг безопасности для этой функции. Скоро появятся новые поставщики!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "Не подключено"
   },
-  "staySafeWithOpenSea": {
-    "message": "Оставайтесь в безопасности с OpenSea"
-  },
   "step1LatticeWallet": {
     "message": "Подключите Lattice1"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 334c05393..ef944e308 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -329,9 +329,6 @@
     "message": "Payagan ang $1 na mag-withdraw at gastusin ang sumusunod na halaga:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Laging siguraduhin na gawin ang iyong sariling angkop na pagsusumikap bago aprubahan ang anumang mga kahilingan."
-  },
   "amount": {
     "message": "Halaga"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Gamitin ang API ng Opensea upang kunin ang NFT data. ang NFT auto-detection ay umaasa sa API ng OpenSea, at hindi magiging available kapag ito ay isinara."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Paganahin ang tagapagbigay ng seguridad"
-  },
   "enableSmartTransactions": {
     "message": "Payagan ang mga smart transaction"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "Pangkalahatan"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Makakuha ng mga babala mula sa OpenSea sa tuwing makakatanggap ka ng kilalang malisyosong kahilingan."
-  },
   "goBack": {
     "message": "Bumalik"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "Hindi Sapat ang Gas"
   },
-  "notNow": {
-    "message": "Hindi ngayon"
-  },
   "notifications": {
     "message": "Mga Abiso"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea na (Beta)"
   },
-  "openSeaAltText": {
-    "message": "Tagapagbigay ng seguridad ng OpenSea"
-  },
-  "openSeaDescription": {
-    "message": "Ang OpenSea ay ang unang tagapagbigay ng seguridad para sa tampok na ito. Marami pang mga provider ang paparating!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "Hindi konektado"
   },
-  "staySafeWithOpenSea": {
-    "message": "Manatiling ligtas sa OpenSea"
-  },
   "step1LatticeWallet": {
     "message": "Ikonekta ang iyong Lattice1"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 3b85a7dc8..eb3841356 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -329,9 +329,6 @@
     "message": "$1 için şu tutara kadar para çekme ve harcama izni ver:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Talepleri onaylamadan önce her zaman bunu gerekli özeni göstererek yaptığınızdan emin olun."
-  },
   "amount": {
     "message": "Tutar"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "NFT verilerini almak için OpenSea API'sini kullanın. NFT otomatik algılama OpenSea API'ye dayalıdır ve bu kapatılırsa mevcut olmayacaktır."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Güvenlik sağlayıcısını etkinleştir"
-  },
   "enableSmartTransactions": {
     "message": "Akıllı işlemleri etkinleştir"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "Genel"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Bilinen bir kötü amaçlı talep aldığınızda OpenSea'den uyarı alın."
-  },
   "goBack": {
     "message": "Geri git"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "Yeterli gaz yok"
   },
-  "notNow": {
-    "message": "Şimdi değil"
-  },
   "notifications": {
     "message": "Bildirimler"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (Beta)"
   },
-  "openSeaAltText": {
-    "message": "OpenSea güvenlik sağlayıcısı"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea bu özellik için birinci güvenlik sağlayıcısıdır. Daha fazla sağlayıcı çok yakında gelecektir!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "Bağlanmadı"
   },
-  "staySafeWithOpenSea": {
-    "message": "OpenSea ile güvende kalın"
-  },
   "step1LatticeWallet": {
     "message": "Lattice1'inizi bağlayın"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 00897f945..1aebc6b67 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -329,9 +329,6 @@
     "message": "Cho phép $1 rút và chi tiêu tối đa số tiền sau đây:",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "Nhớ luôn tự thẩm định trước khi phê duyệt bất kỳ yêu cầu nào."
-  },
   "amount": {
     "message": "Số tiền"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "Sử dụng API của OpenSea để tìm nạp dữ liệu NFT. Tính năng tự động phát hiện NFT dựa vào API của OpenSea và sẽ không khả dụng nếu tính năng này bị tắt."
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "Kích hoạt nhà cung cấp bảo mật"
-  },
   "enableSmartTransactions": {
     "message": "Bật giao dịch thông minh"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "Chung"
   },
-  "getWarningsFromOpenSea": {
-    "message": "Nhận cảnh báo từ OpenSea bất cứ khi nào bạn nhận được một yêu cầu độc hại đã biết."
-  },
   "goBack": {
     "message": "Quay Lại"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "Không đủ gas"
   },
-  "notNow": {
-    "message": "Không phải bây giờ"
-  },
   "notifications": {
     "message": "Thông báo"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea (Beta)"
   },
-  "openSeaAltText": {
-    "message": "Nhà cung cấp bảo mật OpenSea"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea là nhà cung cấp bảo mật đầu tiên cho tính năng này. Sắp có thêm nhiều nhà cung cấp khác!"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "Chưa kết nối"
   },
-  "staySafeWithOpenSea": {
-    "message": "Đảm bảo an toàn với OpenSea"
-  },
   "step1LatticeWallet": {
     "message": "Kết nối với Lattice1"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 096dcd1e4..78d5099ef 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -329,9 +329,6 @@
     "message": "允许 $1 提取和消费最高以下金额：",
     "description": "The url of the site that requested permission to 'withdraw and spend'"
   },
-  "alwaysBeSureTo": {
-    "message": "在批准任何请求之前，始终确保执行自身尽职调查。"
-  },
   "amount": {
     "message": "数额"
   },
@@ -1225,9 +1222,6 @@
   "enableOpenSeaAPIDescription": {
     "message": "使用 OpenSea 的 API 获取 NFT 数据。NFT 自动检测依赖于 OpenSea 的 API，在后者关闭时自动检测将不可用。"
   },
-  "enableOpenSeaSecurityProvider": {
-    "message": "启用安全服务提供商"
-  },
   "enableSmartTransactions": {
     "message": "启用智能交易"
   },
@@ -1519,9 +1513,6 @@
   "general": {
     "message": "常规"
   },
-  "getWarningsFromOpenSea": {
-    "message": "每当收到已知恶意请求，即从 OpenSea 获取警告。"
-  },
   "goBack": {
     "message": "返回"
   },
@@ -2275,9 +2266,6 @@
   "notEnoughGas": {
     "message": "燃料不足"
   },
-  "notNow": {
-    "message": "暂时不"
-  },
   "notifications": {
     "message": "通知"
   },
@@ -2608,12 +2596,6 @@
   "openSea": {
     "message": "OpenSea（测试版）"
   },
-  "openSeaAltText": {
-    "message": "OpenSea 安全服务提供商"
-  },
-  "openSeaDescription": {
-    "message": "OpenSea 是该功能的第一个安全服务提供商。即将推出更多提供商！"
-  },
   "openSeaNew": {
     "message": "OpenSea"
   },
@@ -3508,9 +3490,6 @@
   "statusNotConnected": {
     "message": "未连接"
   },
-  "staySafeWithOpenSea": {
-    "message": "通过 OpenSea 确保安全"
-  },
   "step1LatticeWallet": {
     "message": "关联您的 Lattice1"
   },
diff --git a/app/images/open-sea-security-provider.svg b/app/images/open-sea-security-provider.svg
deleted file mode 100644
index ac79c0026..000000000
--- a/app/images/open-sea-security-provider.svg
+++ /dev/null
@@ -1,91 +0,0 @@
-<svg width="271" height="176" viewBox="0 0 271 176" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M150.275 168.623C195.543 151.885 220.904 105.028 220.904 71.8728C220.904 14.7024 159.526 -2.49604 126.405 16.4642C90.9002 36.7888 103.565 65.9803 97.0175 89.2448C91.0577 110.421 38.815 111.435 30.446 111.942C22.077 112.45 2.29576 118.283 13.2008 139.966C24.1059 161.649 98.0319 187.94 150.275 168.623Z" fill="url(#paint0_linear_4806_28636)"/>
-<mask id="mask0_4806_28636" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="9" y="9" width="213" height="167">
-<path d="M150.275 168.623C195.543 151.885 220.904 105.028 220.904 71.8728C220.904 14.7024 174.52 -1.23221 141.398 17.728C105.894 38.0526 64.2254 15.0098 57.6779 38.2743C51.7181 59.4504 38.815 111.435 30.446 111.942C22.077 112.45 2.29576 118.283 13.2008 139.966C24.1059 161.649 98.0319 187.94 150.275 168.623Z" fill="#C4C4C4" stroke="black" stroke-width="0.253606"/>
-</mask>
-<g mask="url(#mask0_4806_28636)">
-</g>
-<mask id="mask1_4806_28636" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="9" y="0" width="213" height="176">
-<path d="M150.339 168.557C195.628 151.421 221 103.448 221 69.5037C221 10.9726 152.314 -11.6045 119.177 7.80694C83.6563 28.6153 61.8191 1.36069 55.2686 25.1789C49.3062 46.859 38.8281 110.008 30.4553 110.527C22.0825 111.046 2.29225 117.018 13.2023 139.217C24.1123 161.417 98.072 188.333 150.339 168.557Z" fill="#C4C4C4" stroke="black" stroke-width="0.253606"/>
-</mask>
-<g mask="url(#mask1_4806_28636)">
-<g filter="url(#filter0_d_4806_28636)">
-<rect x="53" y="58" width="141" height="249" fill="url(#pattern0)"/>
-</g>
-<rect x="53" y="67" width="141" height="218" fill="white"/>
-<rect x="96" y="130" width="52" height="28" fill="url(#pattern1)"/>
-<g clip-path="url(#clip0_4806_28636)">
-<rect x="63" y="78" width="121.29" height="45.8694" rx="1.48367" fill="#D73A49" fill-opacity="0.1"/>
-<rect width="1.48367" height="45.8694" transform="translate(63 78)" fill="#D73A49"/>
-<rect x="68.9346" y="82.451" width="8.90202" height="8.90202" rx="4.45101" fill="#D73A49" fill-opacity="0.1"/>
-<path d="M75.4662 87.5855L74.1019 84.9734C73.9186 84.622 73.6649 84.4292 73.3857 84.4292C73.1064 84.4292 72.8527 84.622 72.6694 84.9734L71.3051 87.5855C71.1324 87.9188 71.1132 88.2385 71.2518 88.4902C71.3904 88.7419 71.6632 88.8802 72.0214 88.8802H74.75C75.1081 88.8802 75.381 88.7419 75.5195 88.4902C75.6581 88.2385 75.6389 87.9166 75.4662 87.5855ZM73.2258 86.0164C73.2258 85.9235 73.2983 85.8464 73.3857 85.8464C73.4731 85.8464 73.5455 85.9235 73.5455 86.0164V87.1502C73.5455 87.2431 73.4731 87.3202 73.3857 87.3202C73.2983 87.3202 73.2258 87.2431 73.2258 87.1502V86.0164ZM73.537 87.9914C73.5264 88.0005 73.5157 88.0095 73.505 88.0186C73.4922 88.0277 73.4795 88.0345 73.4667 88.039C73.4539 88.0458 73.4411 88.0504 73.4262 88.0526C73.4134 88.0549 73.3985 88.0572 73.3857 88.0572C73.3729 88.0572 73.3579 88.0549 73.343 88.0526C73.3302 88.0504 73.3174 88.0458 73.3047 88.039C73.2919 88.0345 73.2791 88.0277 73.2663 88.0186C73.2556 88.0095 73.245 88.0005 73.2343 87.9914C73.1959 87.9483 73.1725 87.8894 73.1725 87.8304C73.1725 87.7715 73.1959 87.7125 73.2343 87.6694C73.245 87.6603 73.2556 87.6513 73.2663 87.6422C73.2791 87.6331 73.2919 87.6263 73.3047 87.6218C73.3174 87.615 73.3302 87.6105 73.343 87.6082C73.3707 87.6014 73.4006 87.6014 73.4262 87.6082C73.4411 87.6105 73.4539 87.615 73.4667 87.6218C73.4795 87.6263 73.4922 87.6331 73.505 87.6422C73.5157 87.6513 73.5264 87.6603 73.537 87.6694C73.5754 87.7125 73.5988 87.7715 73.5988 87.8304C73.5988 87.8894 73.5754 87.9483 73.537 87.9914Z" fill="#D73A49"/>
-<path d="M82.1393 85.9021H80.9167V85.2374H84.0621V85.9021H82.8336V89.451H82.1393V85.9021ZM84.564 89.451V85H85.2168V86.8872C85.3078 86.7369 85.4324 86.6221 85.5907 86.543C85.7489 86.4639 85.925 86.4243 86.1189 86.4243C86.289 86.4243 86.4433 86.454 86.5818 86.5133C86.7242 86.5727 86.8449 86.6558 86.9438 86.7626C87.0427 86.8694 87.1179 87 87.1693 87.1543C87.2247 87.3046 87.2524 87.4748 87.2524 87.6647V89.451H86.5996V87.7715C86.5996 87.5341 86.5442 87.3501 86.4334 87.2196C86.3226 87.085 86.1723 87.0178 85.9824 87.0178C85.7648 87.0178 85.5828 87.1009 85.4364 87.267C85.29 87.4293 85.2168 87.6706 85.2168 87.9911V89.451H84.564ZM88.4141 85.8368C88.2954 85.8368 88.1926 85.7952 88.1055 85.7122C88.0185 85.6251 87.9749 85.5203 87.9749 85.3976C87.9749 85.2789 88.0185 85.178 88.1055 85.0949C88.1926 85.0079 88.2954 84.9644 88.4141 84.9644C88.5368 84.9644 88.6396 85.0079 88.7227 85.0949C88.8058 85.178 88.8473 85.2789 88.8473 85.3976C88.8473 85.5203 88.8058 85.6251 88.7227 85.7122C88.6396 85.7952 88.5368 85.8368 88.4141 85.8368ZM88.0877 86.4837H88.7405V89.451H88.0877V86.4837ZM90.5614 89.5104C90.2963 89.5104 90.0569 89.4589 89.8433 89.356C89.6336 89.2532 89.4753 89.0949 89.3685 88.8813L89.8492 88.5371C89.9085 88.6676 90.0035 88.7685 90.1341 88.8397C90.2686 88.9109 90.411 88.9466 90.5614 88.9466C90.6761 88.9466 90.775 88.9208 90.8581 88.8694C90.9451 88.814 90.9887 88.7349 90.9887 88.632C90.9887 88.545 90.957 88.4738 90.8937 88.4184C90.8304 88.363 90.7097 88.3076 90.5317 88.2522L90.2706 88.181C90.0094 88.1098 89.8136 87.997 89.683 87.8427C89.5525 87.6844 89.4892 87.4945 89.4931 87.273C89.4931 87.1424 89.5208 87.0257 89.5762 86.9228C89.6316 86.816 89.7068 86.727 89.8017 86.6558C89.8967 86.5806 90.0075 86.5232 90.1341 86.4837C90.2646 86.4441 90.4051 86.4243 90.5554 86.4243C90.7809 86.4243 90.9788 86.4678 91.1489 86.5549C91.319 86.638 91.4555 86.7626 91.5584 86.9288L91.1073 87.273C91.0401 87.182 90.959 87.1088 90.864 87.0534C90.773 86.998 90.6662 86.9703 90.5436 86.9703C90.4446 86.9703 90.3536 86.994 90.2706 87.0415C90.1875 87.089 90.1459 87.1582 90.1459 87.2492C90.1459 87.3205 90.1677 87.3857 90.2112 87.4451C90.2587 87.5044 90.3556 87.5559 90.502 87.5994L90.8047 87.6884C91.0658 87.7675 91.2696 87.8763 91.4159 88.0148C91.5623 88.1533 91.6355 88.3452 91.6355 88.5905C91.6355 88.7329 91.6078 88.8615 91.5524 88.9762C91.4971 89.087 91.4219 89.1839 91.3269 89.267C91.232 89.3462 91.1192 89.4075 90.9887 89.451C90.8581 89.4906 90.7157 89.5104 90.5614 89.5104ZM93.7094 85H94.3622V89.451H93.7094V85ZM96.5807 89.5104C96.3591 89.5104 96.1534 89.4708 95.9635 89.3917C95.7775 89.3125 95.6133 89.2037 95.4709 89.0652C95.3324 88.9228 95.2236 88.7586 95.1445 88.5727C95.0654 88.3828 95.0258 88.181 95.0258 87.9673C95.0258 87.7537 95.0654 87.5539 95.1445 87.3679C95.2236 87.178 95.3324 87.0138 95.4709 86.8754C95.6133 86.7329 95.7775 86.6221 95.9635 86.543C96.1534 86.4639 96.3591 86.4243 96.5807 86.4243C96.7983 86.4243 97.0021 86.4639 97.192 86.543C97.3819 86.6221 97.5461 86.7329 97.6845 86.8754C97.827 87.0138 97.9378 87.178 98.0169 87.3679C98.096 87.5539 98.1356 87.7537 98.1356 87.9673C98.1356 88.181 98.096 88.3828 98.0169 88.5727C97.9378 88.7586 97.827 88.9228 97.6845 89.0652C97.5461 89.2037 97.3819 89.3125 97.192 89.3917C97.0021 89.4708 96.7983 89.5104 96.5807 89.5104ZM96.5807 88.905C96.7113 88.905 96.83 88.8813 96.9368 88.8338C97.0476 88.7863 97.1425 88.721 97.2216 88.638C97.3008 88.5509 97.3621 88.45 97.4056 88.3353C97.4491 88.2205 97.4709 88.0979 97.4709 87.9673C97.4709 87.8368 97.4491 87.7141 97.4056 87.5994C97.3621 87.4846 97.3008 87.3857 97.2216 87.3027C97.1425 87.2156 97.0476 87.1483 96.9368 87.1009C96.83 87.0534 96.7113 87.0297 96.5807 87.0297C96.4501 87.0297 96.3295 87.0534 96.2187 87.1009C96.1079 87.1483 96.0129 87.2156 95.9338 87.3027C95.8547 87.3857 95.7934 87.4846 95.7498 87.5994C95.7063 87.7141 95.6846 87.8368 95.6846 87.9673C95.6846 88.0979 95.7063 88.2205 95.7498 88.3353C95.7934 88.45 95.8547 88.5509 95.9338 88.638C96.0129 88.721 96.1079 88.7863 96.2187 88.8338C96.3295 88.8813 96.4501 88.905 96.5807 88.905ZM100.133 89.5104C99.9118 89.5104 99.7061 89.4708 99.5162 89.3917C99.3302 89.3125 99.166 89.2037 99.0236 89.0652C98.8851 88.9228 98.7763 88.7586 98.6972 88.5727C98.6181 88.3828 98.5785 88.181 98.5785 87.9673C98.5785 87.7537 98.6181 87.5539 98.6972 87.3679C98.7763 87.178 98.8851 87.0138 99.0236 86.8754C99.166 86.7329 99.3302 86.6221 99.5162 86.543C99.7061 86.4639 99.9118 86.4243 100.133 86.4243C100.351 86.4243 100.555 86.4639 100.745 86.543C100.935 86.6221 101.099 86.7329 101.237 86.8754C101.38 87.0138 101.49 87.178 101.57 87.3679C101.649 87.5539 101.688 87.7537 101.688 87.9673C101.688 88.181 101.649 88.3828 101.57 88.5727C101.49 88.7586 101.38 88.9228 101.237 89.0652C101.099 89.2037 100.935 89.3125 100.745 89.3917C100.555 89.4708 100.351 89.5104 100.133 89.5104ZM100.133 88.905C100.264 88.905 100.383 88.8813 100.489 88.8338C100.6 88.7863 100.695 88.721 100.774 88.638C100.853 88.5509 100.915 88.45 100.958 88.3353C101.002 88.2205 101.024 88.0979 101.024 87.9673C101.024 87.8368 101.002 87.7141 100.958 87.5994C100.915 87.4846 100.853 87.3857 100.774 87.3027C100.695 87.2156 100.6 87.1483 100.489 87.1009C100.383 87.0534 100.264 87.0297 100.133 87.0297C100.003 87.0297 99.8822 87.0534 99.7714 87.1009C99.6606 87.1483 99.5656 87.2156 99.4865 87.3027C99.4074 87.3857 99.3461 87.4846 99.3025 87.5994C99.259 87.7141 99.2373 87.8368 99.2373 87.9673C99.2373 88.0979 99.259 88.2205 99.3025 88.3353C99.3461 88.45 99.4074 88.5509 99.4865 88.638C99.5656 88.721 99.6606 88.7863 99.7714 88.8338C99.8822 88.8813 100.003 88.905 100.133 88.905ZM102.998 88.0207V89.451H102.345V85H102.998V87.6113L104.131 86.4837H104.956L103.633 87.8071L105.253 89.451H104.416L102.998 88.0207ZM106.482 89.5104C106.217 89.5104 105.977 89.4589 105.764 89.356C105.554 89.2532 105.396 89.0949 105.289 88.8813L105.77 88.5371C105.829 88.6676 105.924 88.7685 106.055 88.8397C106.189 88.9109 106.331 88.9466 106.482 88.9466C106.597 88.9466 106.695 88.9208 106.779 88.8694C106.866 88.814 106.909 88.7349 106.909 88.632C106.909 88.545 106.877 88.4738 106.814 88.4184C106.751 88.363 106.63 88.3076 106.452 88.2522L106.191 88.181C105.93 88.1098 105.734 87.997 105.603 87.8427C105.473 87.6844 105.41 87.4945 105.414 87.273C105.414 87.1424 105.441 87.0257 105.497 86.9228C105.552 86.816 105.627 86.727 105.722 86.6558C105.817 86.5806 105.928 86.5232 106.055 86.4837C106.185 86.4441 106.326 86.4243 106.476 86.4243C106.701 86.4243 106.899 86.4678 107.069 86.5549C107.239 86.638 107.376 86.7626 107.479 86.9288L107.028 87.273C106.961 87.182 106.879 87.1088 106.784 87.0534C106.693 86.998 106.587 86.9703 106.464 86.9703C106.365 86.9703 106.274 86.994 106.191 87.0415C106.108 87.089 106.066 87.1582 106.066 87.2492C106.066 87.3205 106.088 87.3857 106.132 87.4451C106.179 87.5044 106.276 87.5559 106.422 87.5994L106.725 87.6884C106.986 87.7675 107.19 87.8763 107.336 88.0148C107.483 88.1533 107.556 88.3452 107.556 88.5905C107.556 88.7329 107.528 88.8615 107.473 88.9762C107.418 89.087 107.342 89.1839 107.247 89.267C107.152 89.3462 107.04 89.4075 106.909 89.451C106.779 89.4906 106.636 89.5104 106.482 89.5104ZM109.63 85H110.283V89.451H109.63V85ZM111.486 85.8368C111.368 85.8368 111.265 85.7952 111.178 85.7122C111.091 85.6251 111.047 85.5203 111.047 85.3976C111.047 85.2789 111.091 85.178 111.178 85.0949C111.265 85.0079 111.368 84.9644 111.486 84.9644C111.609 84.9644 111.712 85.0079 111.795 85.0949C111.878 85.178 111.92 85.2789 111.92 85.3976C111.92 85.5203 111.878 85.6251 111.795 85.7122C111.712 85.7952 111.609 85.8368 111.486 85.8368ZM111.16 86.4837H111.813V89.451H111.16V86.4837ZM113.343 88.0207V89.451H112.69V85H113.343V87.6113L114.476 86.4837H115.301L113.978 87.8071L115.598 89.451H114.761L113.343 88.0207ZM117.085 89.5104C116.86 89.5104 116.652 89.4728 116.462 89.3976C116.272 89.3224 116.108 89.2176 115.97 89.0831C115.835 88.9446 115.728 88.7804 115.649 88.5905C115.574 88.4006 115.537 88.1929 115.537 87.9673C115.537 87.7497 115.574 87.548 115.649 87.362C115.728 87.1721 115.835 87.0079 115.97 86.8694C116.108 86.7309 116.272 86.6221 116.462 86.543C116.652 86.4639 116.86 86.4243 117.085 86.4243C117.279 86.4243 117.463 86.456 117.637 86.5193C117.811 86.5826 117.964 86.6775 118.094 86.8041C118.225 86.9268 118.328 87.0811 118.403 87.267C118.478 87.449 118.516 87.6587 118.516 87.8961C118.516 87.9278 118.516 87.9594 118.516 87.9911C118.516 88.0227 118.514 88.0623 118.51 88.1098H116.177C116.185 88.2324 116.213 88.3432 116.261 88.4421C116.312 88.541 116.377 88.6261 116.456 88.6973C116.539 88.7685 116.634 88.8239 116.741 88.8635C116.852 88.8991 116.969 88.9169 117.091 88.9169C117.301 88.9169 117.475 88.8753 117.614 88.7923C117.752 88.7052 117.861 88.5964 117.94 88.4658L118.439 88.8219C118.304 89.0356 118.122 89.2037 117.893 89.3264C117.667 89.449 117.398 89.5104 117.085 89.5104ZM117.857 87.635C117.821 87.4213 117.726 87.2591 117.572 87.1483C117.422 87.0336 117.252 86.9762 117.062 86.9762C116.967 86.9762 116.872 86.9901 116.777 87.0178C116.686 87.0455 116.601 87.087 116.522 87.1424C116.447 87.1978 116.381 87.267 116.326 87.3501C116.27 87.4293 116.231 87.5242 116.207 87.635H117.857ZM121.8 89.5104C121.598 89.5104 121.408 89.4708 121.23 89.3917C121.056 89.3086 120.906 89.1978 120.779 89.0593C120.653 88.9169 120.552 88.7527 120.477 88.5667C120.406 88.3808 120.37 88.181 120.37 87.9673C120.37 87.7537 120.406 87.5539 120.477 87.3679C120.552 87.182 120.653 87.0198 120.779 86.8813C120.906 86.7389 121.056 86.6281 121.23 86.5489C121.408 86.4659 121.598 86.4243 121.8 86.4243C122.014 86.4243 122.204 86.4718 122.37 86.5667C122.54 86.6577 122.667 86.7626 122.75 86.8813V86.4837H123.403V89.451H122.75V89.0534C122.667 89.1721 122.54 89.2789 122.37 89.3739C122.204 89.4649 122.014 89.5104 121.8 89.5104ZM121.919 88.9169C122.049 88.9169 122.168 88.8931 122.275 88.8457C122.386 88.7942 122.479 88.727 122.554 88.6439C122.633 88.5568 122.694 88.456 122.738 88.3412C122.781 88.2265 122.803 88.1019 122.803 87.9673C122.803 87.8328 122.781 87.7082 122.738 87.5934C122.694 87.4787 122.633 87.3798 122.554 87.2967C122.479 87.2097 122.386 87.1424 122.275 87.0949C122.168 87.0435 122.049 87.0178 121.919 87.0178C121.788 87.0178 121.668 87.0435 121.557 87.0949C121.45 87.1424 121.357 87.2097 121.278 87.2967C121.203 87.3798 121.143 87.4787 121.1 87.5934C121.056 87.7082 121.035 87.8328 121.035 87.9673C121.035 88.1019 121.056 88.2265 121.1 88.3412C121.143 88.456 121.203 88.5568 121.278 88.6439C121.357 88.727 121.45 88.7942 121.557 88.8457C121.668 88.8931 121.788 88.9169 121.919 88.9169ZM126.627 89.5104C126.362 89.5104 126.123 89.4589 125.909 89.356C125.699 89.2532 125.541 89.0949 125.434 88.8813L125.915 88.5371C125.974 88.6676 126.069 88.7685 126.2 88.8397C126.335 88.9109 126.477 88.9466 126.627 88.9466C126.742 88.9466 126.841 88.9208 126.924 88.8694C127.011 88.814 127.055 88.7349 127.055 88.632C127.055 88.545 127.023 88.4738 126.96 88.4184C126.896 88.363 126.776 88.3076 126.598 88.2522L126.336 88.181C126.075 88.1098 125.88 87.997 125.749 87.8427C125.618 87.6844 125.555 87.4945 125.559 87.273C125.559 87.1424 125.587 87.0257 125.642 86.9228C125.698 86.816 125.773 86.727 125.868 86.6558C125.963 86.5806 126.073 86.5232 126.2 86.4837C126.331 86.4441 126.471 86.4243 126.621 86.4243C126.847 86.4243 127.045 86.4678 127.215 86.5549C127.385 86.638 127.521 86.7626 127.624 86.9288L127.173 87.273C127.106 87.182 127.025 87.1088 126.93 87.0534C126.839 86.998 126.732 86.9703 126.609 86.9703C126.511 86.9703 126.42 86.994 126.336 87.0415C126.253 87.089 126.212 87.1582 126.212 87.2492C126.212 87.3205 126.234 87.3857 126.277 87.4451C126.325 87.5044 126.422 87.5559 126.568 87.5994L126.871 87.6884C127.132 87.7675 127.335 87.8763 127.482 88.0148C127.628 88.1533 127.701 88.3452 127.701 88.5905C127.701 88.7329 127.674 88.8615 127.618 88.9762C127.563 89.087 127.488 89.1839 127.393 89.267C127.298 89.3462 127.185 89.4075 127.055 89.451C126.924 89.4906 126.782 89.5104 126.627 89.5104ZM129.732 89.5104C129.51 89.5104 129.302 89.4708 129.109 89.3917C128.919 89.3125 128.753 89.2057 128.61 89.0712C128.472 88.9327 128.363 88.7705 128.284 88.5845C128.205 88.3946 128.165 88.1889 128.165 87.9673C128.165 87.7497 128.205 87.546 128.284 87.3561C128.363 87.1662 128.472 87.0039 128.61 86.8694C128.753 86.7309 128.919 86.6221 129.109 86.543C129.302 86.4639 129.51 86.4243 129.732 86.4243C130.04 86.4243 130.315 86.4995 130.557 86.6498C130.802 86.7962 130.988 86.994 131.115 87.2433L130.545 87.5519C130.474 87.4016 130.367 87.2769 130.224 87.178C130.086 87.0791 129.922 87.0297 129.732 87.0297C129.601 87.0297 129.48 87.0534 129.37 87.1009C129.259 87.1483 129.162 87.2156 129.079 87.3027C129 87.3857 128.938 87.4846 128.895 87.5994C128.851 87.7141 128.83 87.8368 128.83 87.9673C128.83 88.0979 128.851 88.2205 128.895 88.3353C128.938 88.45 129 88.5509 129.079 88.638C129.162 88.721 129.259 88.7863 129.37 88.8338C129.48 88.8813 129.601 88.905 129.732 88.905C129.922 88.905 130.086 88.8556 130.224 88.7566C130.367 88.6577 130.474 88.5331 130.545 88.3828L131.115 88.6914C130.988 88.9406 130.802 89.1404 130.557 89.2908C130.315 89.4372 130.04 89.5104 129.732 89.5104ZM132.928 89.5104C132.726 89.5104 132.536 89.4708 132.358 89.3917C132.184 89.3086 132.034 89.1978 131.907 89.0593C131.78 88.9169 131.679 88.7527 131.604 88.5667C131.533 88.3808 131.497 88.181 131.497 87.9673C131.497 87.7537 131.533 87.5539 131.604 87.3679C131.679 87.182 131.78 87.0198 131.907 86.8813C132.034 86.7389 132.184 86.6281 132.358 86.5489C132.536 86.4659 132.726 86.4243 132.928 86.4243C133.141 86.4243 133.331 86.4718 133.497 86.5667C133.668 86.6577 133.794 86.7626 133.877 86.8813V86.4837H134.53V89.451H133.877V89.0534C133.794 89.1721 133.668 89.2789 133.497 89.3739C133.331 89.4649 133.141 89.5104 132.928 89.5104ZM133.046 88.9169C133.177 88.9169 133.296 88.8931 133.402 88.8457C133.513 88.7942 133.606 88.727 133.681 88.6439C133.761 88.5568 133.822 88.456 133.865 88.3412C133.909 88.2265 133.931 88.1019 133.931 87.9673C133.931 87.8328 133.909 87.7082 133.865 87.5934C133.822 87.4787 133.761 87.3798 133.681 87.2967C133.606 87.2097 133.513 87.1424 133.402 87.0949C133.296 87.0435 133.177 87.0178 133.046 87.0178C132.916 87.0178 132.795 87.0435 132.684 87.0949C132.578 87.1424 132.485 87.2097 132.405 87.2967C132.33 87.3798 132.271 87.4787 132.227 87.5934C132.184 87.7082 132.162 87.8328 132.162 87.9673C132.162 88.1019 132.184 88.2265 132.227 88.3412C132.271 88.456 132.33 88.5568 132.405 88.6439C132.485 88.727 132.578 88.7942 132.684 88.8457C132.795 88.8931 132.916 88.9169 133.046 88.9169ZM139.195 87.7834C139.195 87.5499 139.151 87.364 139.064 87.2255C138.977 87.087 138.845 87.0178 138.667 87.0178C138.461 87.0178 138.293 87.0989 138.162 87.2611C138.036 87.4194 137.968 87.6469 137.96 87.9436V89.451H137.308V87.7834C137.308 87.5499 137.264 87.364 137.177 87.2255C137.09 87.087 136.957 87.0178 136.779 87.0178C136.566 87.0178 136.394 87.1028 136.263 87.273C136.133 87.4391 136.067 87.6785 136.067 87.9911V89.451H135.414V86.4837H136.067V86.8872C136.15 86.7487 136.263 86.638 136.406 86.5549C136.552 86.4678 136.72 86.4243 136.91 86.4243C137.132 86.4243 137.319 86.4758 137.474 86.5786C137.632 86.6815 137.751 86.8259 137.83 87.0119C137.917 86.8219 138.047 86.6775 138.222 86.5786C138.396 86.4758 138.582 86.4243 138.779 86.4243C139.116 86.4243 139.377 86.5391 139.563 86.7685C139.753 86.994 139.848 87.2967 139.848 87.6765V89.451H139.195V87.7834Z" fill="#24272A"/>
-<path d="M81.2921 93.7641H81.775V97.451H81.2921V93.7641ZM82.8981 95.2648H82.3476V94.8546H82.8981V94.3301C82.8981 94.1951 82.9171 94.0774 82.9552 93.977C82.9968 93.8766 83.0521 93.7935 83.1214 93.7277C83.1941 93.6585 83.2789 93.6083 83.3758 93.5771C83.4728 93.5425 83.5784 93.5252 83.6926 93.5252C83.7722 93.5252 83.8449 93.5321 83.9107 93.546C83.9765 93.5564 84.0388 93.5719 84.0976 93.5927V93.9874C84.0561 93.9701 84.0042 93.958 83.9419 93.951C83.883 93.9406 83.8276 93.9354 83.7757 93.9354C83.6303 93.9354 83.5212 93.9683 83.4485 94.0341C83.3793 94.0964 83.3447 94.2107 83.3447 94.3768V94.8546H84.0976V95.2648H83.3447V97.451H82.8981V95.2648ZM85.7728 98.5363L86.3388 97.316L85.2016 94.8546H85.6949L86.5881 96.8279L87.4761 94.8546H87.9746L86.2713 98.5363H85.7728ZM89.5175 97.5029C89.3202 97.5029 89.1385 97.4683 88.9723 97.3991C88.8061 97.3264 88.6625 97.2294 88.5413 97.1083C88.4201 96.9871 88.3249 96.8452 88.2557 96.6825C88.1899 96.5163 88.157 96.3397 88.157 96.1528C88.157 95.9659 88.1899 95.791 88.2557 95.6283C88.3249 95.4621 88.4201 95.3185 88.5413 95.1973C88.6625 95.0761 88.8061 94.9809 88.9723 94.9117C89.1385 94.839 89.3202 94.8027 89.5175 94.8027C89.7114 94.8027 89.8914 94.839 90.0576 94.9117C90.2238 94.9809 90.3674 95.0761 90.4886 95.1973C90.6098 95.3185 90.7032 95.4621 90.769 95.6283C90.8383 95.791 90.8729 95.9659 90.8729 96.1528C90.8729 96.3397 90.8383 96.5163 90.769 96.6825C90.7032 96.8452 90.6098 96.9871 90.4886 97.1083C90.3674 97.2294 90.2238 97.3264 90.0576 97.3991C89.8914 97.4683 89.7114 97.5029 89.5175 97.5029ZM89.5175 97.0875C89.6526 97.0875 89.7755 97.0633 89.8862 97.0148C89.997 96.9663 90.0905 96.9006 90.1667 96.8175C90.2463 96.7309 90.3069 96.6323 90.3484 96.5215C90.3934 96.4072 90.4159 96.2843 90.4159 96.1528C90.4159 96.0247 90.3934 95.9035 90.3484 95.7893C90.3069 95.6751 90.2463 95.5764 90.1667 95.4933C90.0905 95.4068 89.997 95.3392 89.8862 95.2908C89.7755 95.2423 89.6526 95.2181 89.5175 95.2181C89.3825 95.2181 89.2596 95.2423 89.1489 95.2908C89.0381 95.3392 88.9429 95.4068 88.8632 95.4933C88.7836 95.5764 88.7213 95.6751 88.6763 95.7893C88.6348 95.9035 88.614 96.0247 88.614 96.1528C88.614 96.2843 88.6348 96.4072 88.6763 96.5215C88.7213 96.6323 88.7836 96.7309 88.8632 96.8175C88.9429 96.9006 89.0381 96.9663 89.1489 97.0148C89.2596 97.0633 89.3825 97.0875 89.5175 97.0875ZM92.433 97.5029C92.2911 97.5029 92.1613 97.4787 92.0436 97.4302C91.9259 97.3783 91.8255 97.3073 91.7424 97.2173C91.6593 97.1273 91.5935 97.0183 91.5451 96.8902C91.5001 96.7586 91.4776 96.6115 91.4776 96.4488V94.8546H91.9241V96.3813C91.9241 96.5994 91.9761 96.7725 92.0799 96.9006C92.1873 97.0287 92.3309 97.0927 92.5109 97.0927C92.6113 97.0927 92.7048 97.0719 92.7914 97.0304C92.8814 96.9854 92.9575 96.9231 93.0198 96.8434C93.0856 96.7604 93.1375 96.66 93.1756 96.5423C93.2137 96.4246 93.2327 96.2913 93.2327 96.1424V94.8546H93.6793V97.451H93.2327V97.0512C93.1462 97.2035 93.032 97.3177 92.89 97.3939C92.7515 97.4666 92.5992 97.5029 92.433 97.5029ZM96.5578 97.5029C96.3258 97.5029 96.1181 97.4545 95.9346 97.3575C95.7512 97.2571 95.6196 97.1048 95.54 96.9006L95.9035 96.698C95.952 96.8296 96.0368 96.9317 96.1579 97.0044C96.2826 97.0737 96.4176 97.1083 96.563 97.1083C96.6876 97.1083 96.7932 97.0789 96.8797 97.02C96.9698 96.9577 97.0148 96.8711 97.0148 96.7604C97.0148 96.6669 96.9819 96.589 96.9161 96.5267C96.8503 96.4644 96.7326 96.4072 96.563 96.3553L96.3033 96.2722C96.0887 96.2099 95.926 96.1147 95.8152 95.9866C95.7079 95.8551 95.6542 95.6976 95.6542 95.5141C95.6542 95.4033 95.6767 95.3046 95.7217 95.2181C95.7702 95.1281 95.8343 95.0536 95.9139 94.9948C95.997 94.9325 96.0922 94.8857 96.1995 94.8546C96.3068 94.82 96.4228 94.8027 96.5474 94.8027C96.7413 94.8027 96.9109 94.8425 97.0563 94.9221C97.2017 94.9983 97.3177 95.109 97.4042 95.2544L97.0719 95.4829C97.013 95.3998 96.9386 95.3306 96.8486 95.2752C96.762 95.2163 96.6565 95.1869 96.5318 95.1869C96.421 95.1869 96.3206 95.2146 96.2306 95.27C96.1441 95.3254 96.1008 95.4016 96.1008 95.4985C96.1008 95.5781 96.1251 95.6491 96.1735 95.7114C96.2254 95.7737 96.3241 95.8274 96.4695 95.8724L96.7551 95.9607C96.9801 96.0299 97.1532 96.1251 97.2744 96.2463C97.399 96.3674 97.4613 96.5267 97.4613 96.724C97.4613 96.8486 97.4388 96.9594 97.3938 97.0563C97.3488 97.1533 97.2848 97.2346 97.2017 97.3004C97.1221 97.3662 97.0269 97.4164 96.9161 97.451C96.8053 97.4856 96.6859 97.5029 96.5578 97.5029ZM98.3399 94.1587C98.2499 94.1587 98.1738 94.1293 98.1115 94.0705C98.0491 94.0081 98.018 93.932 98.018 93.842C98.018 93.7554 98.0491 93.681 98.1115 93.6187C98.1738 93.5564 98.2499 93.5252 98.3399 93.5252C98.43 93.5252 98.5044 93.5564 98.5632 93.6187C98.6221 93.681 98.6515 93.7554 98.6515 93.842C98.6515 93.932 98.6221 94.0081 98.5632 94.0705C98.5044 94.1293 98.43 94.1587 98.3399 94.1587ZM98.1115 94.8546H98.558V97.451H98.1115V94.8546ZM100.537 97.0304C100.665 97.0304 100.782 97.0079 100.89 96.9629C101.001 96.9179 101.094 96.8556 101.17 96.7759C101.246 96.6928 101.305 96.5959 101.347 96.4851C101.392 96.3744 101.414 96.2532 101.414 96.1216C101.414 95.9935 101.392 95.8741 101.347 95.7633C101.305 95.6491 101.246 95.5522 101.17 95.4725C101.094 95.3929 101.001 95.3306 100.89 95.2856C100.782 95.2371 100.665 95.2129 100.537 95.2129C100.405 95.2129 100.286 95.2371 100.178 95.2856C100.071 95.3306 99.9793 95.3929 99.9031 95.4725C99.827 95.5522 99.7664 95.6491 99.7214 95.7633C99.6798 95.8741 99.6591 95.9935 99.6591 96.1216C99.6591 96.2532 99.6798 96.3744 99.7214 96.4851C99.7664 96.5959 99.827 96.6928 99.9031 96.7759C99.9793 96.8556 100.071 96.9179 100.178 96.9629C100.286 97.0079 100.405 97.0304 100.537 97.0304ZM100.511 98.5882C100.23 98.5882 99.9845 98.5363 99.7733 98.4325C99.5621 98.3286 99.4011 98.204 99.2904 98.0586L99.6019 97.747C99.7058 97.8785 99.8321 97.9841 99.981 98.0638C100.133 98.1434 100.31 98.1832 100.511 98.1832C100.621 98.1832 100.729 98.1659 100.833 98.1313C100.936 98.0966 101.028 98.0413 101.108 97.9651C101.191 97.8924 101.257 97.7989 101.305 97.6847C101.354 97.5739 101.378 97.4406 101.378 97.2848V96.9888C101.288 97.1204 101.163 97.2294 101.004 97.316C100.845 97.4025 100.668 97.4458 100.474 97.4458C100.294 97.4458 100.126 97.4129 99.9706 97.3471C99.8148 97.2779 99.6798 97.1844 99.5656 97.0667C99.4513 96.9456 99.3613 96.8054 99.2956 96.6461C99.2332 96.4834 99.2021 96.3086 99.2021 96.1216C99.2021 95.9382 99.2332 95.7668 99.2956 95.6075C99.3613 95.4448 99.4513 95.3046 99.5656 95.1869C99.6798 95.0658 99.8148 94.9723 99.9706 94.9065C100.126 94.8373 100.294 94.8027 100.474 94.8027C100.668 94.8027 100.845 94.8459 101.004 94.9325C101.163 95.0156 101.288 95.1229 101.378 95.2544V94.8546H101.824V97.3004C101.824 97.5185 101.79 97.7072 101.721 97.8664C101.655 98.0291 101.563 98.1624 101.445 98.2663C101.328 98.3736 101.189 98.4532 101.03 98.5052C100.871 98.5605 100.698 98.5882 100.511 98.5882ZM102.665 94.8546H103.112V95.2544C103.202 95.0986 103.32 94.9844 103.465 94.9117C103.61 94.839 103.768 94.8027 103.938 94.8027C104.083 94.8027 104.216 94.8269 104.337 94.8754C104.459 94.9238 104.561 94.9948 104.644 95.0883C104.73 95.1783 104.798 95.289 104.846 95.4206C104.895 95.5487 104.919 95.6924 104.919 95.8516V97.451H104.478V95.9191C104.478 95.701 104.421 95.5297 104.306 95.405C104.196 95.2769 104.048 95.2129 103.865 95.2129C103.761 95.2129 103.662 95.2337 103.569 95.2752C103.479 95.3167 103.399 95.3791 103.33 95.4621C103.264 95.5418 103.211 95.6404 103.169 95.7581C103.131 95.8758 103.112 96.0109 103.112 96.1632V97.451H102.665V94.8546ZM107.897 97.477C107.783 97.477 107.677 97.4614 107.58 97.4302C107.483 97.3956 107.398 97.3471 107.326 97.2848C107.257 97.2191 107.201 97.136 107.16 97.0356C107.122 96.9352 107.103 96.8175 107.103 96.6825V95.2648H106.552V94.8546H107.103V94.1328H107.549V94.8546H108.297V95.2648H107.549V96.6253C107.549 96.7915 107.585 96.9075 107.658 96.9733C107.731 97.0356 107.838 97.0667 107.98 97.0667C108.035 97.0667 108.091 97.0633 108.146 97.0563C108.205 97.046 108.255 97.0321 108.297 97.0148V97.4147C108.241 97.432 108.181 97.4458 108.115 97.4562C108.049 97.47 107.977 97.477 107.897 97.477ZM108.867 97.451V93.5564H109.314V95.2544C109.404 95.0986 109.522 94.9844 109.667 94.9117C109.812 94.839 109.97 94.8027 110.14 94.8027C110.285 94.8027 110.418 94.8269 110.539 94.8754C110.661 94.9238 110.763 94.9948 110.846 95.0883C110.932 95.1783 111 95.289 111.048 95.4206C111.097 95.5487 111.121 95.6924 111.121 95.8516V97.451H110.68V95.9191C110.68 95.701 110.623 95.5297 110.508 95.405C110.398 95.2769 110.25 95.2129 110.067 95.2129C109.963 95.2129 109.864 95.2337 109.771 95.2752C109.681 95.3167 109.601 95.3791 109.532 95.4621C109.466 95.5418 109.413 95.6404 109.371 95.7581C109.333 95.8758 109.314 96.0109 109.314 96.1632V97.451H108.867ZM112.154 94.1587C112.064 94.1587 111.988 94.1293 111.925 94.0705C111.863 94.0081 111.832 93.932 111.832 93.842C111.832 93.7554 111.863 93.681 111.925 93.6187C111.988 93.5564 112.064 93.5252 112.154 93.5252C112.244 93.5252 112.318 93.5564 112.377 93.6187C112.436 93.681 112.465 93.7554 112.465 93.842C112.465 93.932 112.436 94.0081 112.377 94.0705C112.318 94.1293 112.244 94.1587 112.154 94.1587ZM111.925 94.8546H112.372V97.451H111.925V94.8546ZM114.002 97.5029C113.771 97.5029 113.563 97.4545 113.379 97.3575C113.196 97.2571 113.064 97.1048 112.985 96.9006L113.348 96.698C113.397 96.8296 113.481 96.9317 113.603 97.0044C113.727 97.0737 113.862 97.1083 114.008 97.1083C114.132 97.1083 114.238 97.0789 114.324 97.02C114.414 96.9577 114.459 96.8711 114.459 96.7604C114.459 96.6669 114.427 96.589 114.361 96.5267C114.295 96.4644 114.177 96.4072 114.008 96.3553L113.748 96.2722C113.533 96.2099 113.371 96.1147 113.26 95.9866C113.153 95.8551 113.099 95.6976 113.099 95.5141C113.099 95.4033 113.121 95.3046 113.166 95.2181C113.215 95.1281 113.279 95.0536 113.359 94.9948C113.442 94.9325 113.537 94.8857 113.644 94.8546C113.752 94.82 113.867 94.8027 113.992 94.8027C114.186 94.8027 114.356 94.8425 114.501 94.9221C114.646 94.9983 114.762 95.109 114.849 95.2544L114.517 95.4829C114.458 95.3998 114.383 95.3306 114.293 95.2752C114.207 95.2163 114.101 95.1869 113.977 95.1869C113.866 95.1869 113.765 95.2146 113.675 95.27C113.589 95.3254 113.546 95.4016 113.546 95.4985C113.546 95.5781 113.57 95.6491 113.618 95.7114C113.67 95.7737 113.769 95.8274 113.914 95.8724L114.2 95.9607C114.425 96.0299 114.598 96.1251 114.719 96.2463C114.844 96.3674 114.906 96.5267 114.906 96.724C114.906 96.8486 114.884 96.9594 114.839 97.0563C114.794 97.1533 114.729 97.2346 114.646 97.3004C114.567 97.3662 114.472 97.4164 114.361 97.451C114.25 97.4856 114.131 97.5029 114.002 97.5029ZM116.809 94.8546H117.255V95.3583C117.28 95.2752 117.318 95.2008 117.37 95.135C117.421 95.0692 117.48 95.0138 117.546 94.9688C117.612 94.9238 117.681 94.8892 117.754 94.865C117.83 94.8407 117.906 94.8286 117.982 94.8286C118.052 94.8286 118.119 94.8355 118.185 94.8494V95.3116C118.143 95.2942 118.103 95.2839 118.065 95.2804C118.027 95.2735 117.986 95.27 117.941 95.27C117.858 95.27 117.775 95.289 117.692 95.3271C117.612 95.3617 117.539 95.4154 117.473 95.4881C117.411 95.5608 117.359 95.6543 117.318 95.7685C117.276 95.8793 117.255 96.0109 117.255 96.1632V97.451H116.809V94.8546ZM119.762 97.5029C119.561 97.5029 119.377 97.4683 119.211 97.3991C119.045 97.3298 118.903 97.2346 118.785 97.1135C118.668 96.9923 118.576 96.8504 118.51 96.6877C118.448 96.5215 118.417 96.3432 118.417 96.1528C118.417 95.9624 118.45 95.7858 118.515 95.6231C118.581 95.457 118.673 95.3133 118.791 95.1921C118.912 95.071 119.055 94.9757 119.222 94.9065C119.388 94.8373 119.569 94.8027 119.767 94.8027C119.936 94.8027 120.096 94.8321 120.245 94.8909C120.393 94.9463 120.523 95.0311 120.634 95.1454C120.748 95.2562 120.838 95.3929 120.904 95.5556C120.97 95.7149 121.003 95.8983 121.003 96.1061C121.003 96.1303 121.003 96.1528 121.003 96.1736C121.003 96.1909 121.001 96.2134 120.997 96.2411H118.868C118.872 96.3622 118.896 96.4747 118.941 96.5786C118.99 96.6825 119.052 96.7725 119.128 96.8486C119.208 96.9248 119.301 96.9854 119.408 97.0304C119.519 97.0719 119.639 97.0927 119.767 97.0927C119.968 97.0927 120.132 97.0529 120.26 96.9733C120.392 96.8902 120.497 96.7794 120.577 96.6409L120.93 96.885C120.812 97.0754 120.655 97.226 120.457 97.3368C120.264 97.4475 120.032 97.5029 119.762 97.5029ZM120.546 95.8776C120.528 95.7703 120.495 95.6751 120.447 95.592C120.402 95.5089 120.343 95.4379 120.27 95.3791C120.201 95.3202 120.122 95.2752 120.032 95.244C119.942 95.2129 119.848 95.1973 119.751 95.1973C119.654 95.1973 119.559 95.2129 119.466 95.244C119.372 95.2752 119.287 95.3202 119.211 95.3791C119.135 95.4344 119.069 95.5054 119.014 95.592C118.958 95.6751 118.92 95.7703 118.9 95.8776H120.546ZM123.62 98.5363V97.0512C123.534 97.1758 123.409 97.2831 123.246 97.3731C123.084 97.4597 122.904 97.5029 122.706 97.5029C122.523 97.5029 122.353 97.4683 122.197 97.3991C122.045 97.3264 121.912 97.2294 121.797 97.1083C121.683 96.9836 121.593 96.84 121.527 96.6773C121.465 96.5146 121.434 96.3397 121.434 96.1528C121.434 95.9659 121.465 95.791 121.527 95.6283C121.593 95.4656 121.683 95.3237 121.797 95.2025C121.912 95.0779 122.045 94.9809 122.197 94.9117C122.353 94.839 122.523 94.8027 122.706 94.8027C122.904 94.8027 123.084 94.8477 123.246 94.9377C123.409 95.0242 123.534 95.1298 123.62 95.2544V94.8546H124.067V98.5363H123.62ZM122.774 97.0927C122.905 97.0927 123.025 97.0685 123.132 97.02C123.239 96.9715 123.331 96.9058 123.407 96.8227C123.487 96.7361 123.547 96.6357 123.589 96.5215C123.634 96.4072 123.656 96.2843 123.656 96.1528C123.656 96.0212 123.634 95.8983 123.589 95.7841C123.547 95.6699 123.487 95.5712 123.407 95.4881C123.331 95.4016 123.239 95.3341 123.132 95.2856C123.025 95.2371 122.905 95.2129 122.774 95.2129C122.642 95.2129 122.521 95.2371 122.41 95.2856C122.303 95.3341 122.209 95.4016 122.13 95.4881C122.054 95.5712 121.993 95.6699 121.948 95.7841C121.906 95.8983 121.886 96.0212 121.886 96.1528C121.886 96.2843 121.906 96.4072 121.948 96.5215C121.993 96.6357 122.054 96.7361 122.13 96.8227C122.209 96.9058 122.303 96.9715 122.41 97.02C122.521 97.0685 122.642 97.0927 122.774 97.0927ZM125.826 97.5029C125.685 97.5029 125.555 97.4787 125.437 97.4302C125.319 97.3783 125.219 97.3073 125.136 97.2173C125.053 97.1273 124.987 97.0183 124.939 96.8902C124.894 96.7586 124.871 96.6115 124.871 96.4488V94.8546H125.318V96.3813C125.318 96.5994 125.37 96.7725 125.473 96.9006C125.581 97.0287 125.724 97.0927 125.904 97.0927C126.005 97.0927 126.098 97.0719 126.185 97.0304C126.275 96.9854 126.351 96.9231 126.413 96.8434C126.479 96.7604 126.531 96.66 126.569 96.5423C126.607 96.4246 126.626 96.2913 126.626 96.1424V94.8546H127.073V97.451H126.626V97.0512C126.54 97.2035 126.425 97.3177 126.283 97.3939C126.145 97.4666 125.993 97.5029 125.826 97.5029ZM129.057 97.5029C128.856 97.5029 128.673 97.4683 128.507 97.3991C128.34 97.3298 128.198 97.2346 128.081 97.1135C127.963 96.9923 127.871 96.8504 127.805 96.6877C127.743 96.5215 127.712 96.3432 127.712 96.1528C127.712 95.9624 127.745 95.7858 127.811 95.6231C127.876 95.457 127.968 95.3133 128.086 95.1921C128.207 95.071 128.351 94.9757 128.517 94.9065C128.683 94.8373 128.865 94.8027 129.062 94.8027C129.232 94.8027 129.391 94.8321 129.54 94.8909C129.689 94.9463 129.819 95.0311 129.929 95.1454C130.044 95.2562 130.134 95.3929 130.199 95.5556C130.265 95.7149 130.298 95.8983 130.298 96.1061C130.298 96.1303 130.298 96.1528 130.298 96.1736C130.298 96.1909 130.296 96.2134 130.293 96.2411H128.164C128.167 96.3622 128.191 96.4747 128.236 96.5786C128.285 96.6825 128.347 96.7725 128.423 96.8486C128.503 96.9248 128.597 96.9854 128.704 97.0304C128.815 97.0719 128.934 97.0927 129.062 97.0927C129.263 97.0927 129.427 97.0529 129.555 96.9733C129.687 96.8902 129.793 96.7794 129.872 96.6409L130.225 96.885C130.108 97.0754 129.95 97.226 129.753 97.3368C129.559 97.4475 129.327 97.5029 129.057 97.5029ZM129.841 95.8776C129.824 95.7703 129.791 95.6751 129.742 95.592C129.697 95.5089 129.639 95.4379 129.566 95.3791C129.497 95.3202 129.417 95.2752 129.327 95.244C129.237 95.2129 129.144 95.1973 129.047 95.1973C128.95 95.1973 128.854 95.2129 128.761 95.244C128.667 95.2752 128.583 95.3202 128.507 95.3791C128.43 95.4344 128.365 95.5054 128.309 95.592C128.254 95.6751 128.216 95.7703 128.195 95.8776H129.841ZM131.716 97.5029C131.484 97.5029 131.276 97.4545 131.093 97.3575C130.909 97.2571 130.778 97.1048 130.698 96.9006L131.062 96.698C131.11 96.8296 131.195 96.9317 131.316 97.0044C131.441 97.0737 131.576 97.1083 131.721 97.1083C131.846 97.1083 131.951 97.0789 132.038 97.02C132.128 96.9577 132.173 96.8711 132.173 96.7604C132.173 96.6669 132.14 96.589 132.074 96.5267C132.009 96.4644 131.891 96.4072 131.721 96.3553L131.462 96.2722C131.247 96.2099 131.084 96.1147 130.973 95.9866C130.866 95.8551 130.812 95.6976 130.812 95.5141C130.812 95.4033 130.835 95.3046 130.88 95.2181C130.928 95.1281 130.992 95.0536 131.072 94.9948C131.155 94.9325 131.25 94.8857 131.358 94.8546C131.465 94.82 131.581 94.8027 131.706 94.8027C131.899 94.8027 132.069 94.8425 132.214 94.9221C132.36 94.9983 132.476 95.109 132.562 95.2544L132.23 95.4829C132.171 95.3998 132.097 95.3306 132.007 95.2752C131.92 95.2163 131.815 95.1869 131.69 95.1869C131.579 95.1869 131.479 95.2146 131.389 95.27C131.302 95.3254 131.259 95.4016 131.259 95.4985C131.259 95.5781 131.283 95.6491 131.332 95.7114C131.384 95.7737 131.482 95.8274 131.628 95.8724L131.913 95.9607C132.138 96.0299 132.311 96.1251 132.433 96.2463C132.557 96.3674 132.62 96.5267 132.62 96.724C132.62 96.8486 132.597 96.9594 132.552 97.0563C132.507 97.1533 132.443 97.2346 132.36 97.3004C132.28 97.3662 132.185 97.4164 132.074 97.451C131.964 97.4856 131.844 97.5029 131.716 97.5029ZM134.252 97.477C134.137 97.477 134.032 97.4614 133.935 97.4302C133.838 97.3956 133.753 97.3471 133.681 97.2848C133.611 97.2191 133.556 97.136 133.514 97.0356C133.476 96.9352 133.457 96.8175 133.457 96.6825V95.2648H132.907V94.8546H133.457V94.1328H133.904V94.8546H134.652V95.2648H133.904V96.6253C133.904 96.7915 133.94 96.9075 134.013 96.9733C134.086 97.0356 134.193 97.0667 134.335 97.0667C134.39 97.0667 134.446 97.0633 134.501 97.0563C134.56 97.046 134.61 97.0321 134.652 97.0148V97.4147C134.596 97.432 134.536 97.4458 134.47 97.4562C134.404 97.47 134.331 97.477 134.252 97.477ZM135.243 98.1936H134.947L135.295 97.451C135.232 97.4198 135.18 97.3748 135.139 97.316C135.101 97.2537 135.082 97.1827 135.082 97.1031C135.082 96.9992 135.118 96.9092 135.191 96.8331C135.267 96.7534 135.359 96.7136 135.466 96.7136C135.573 96.7136 135.663 96.7534 135.736 96.8331C135.812 96.9092 135.85 96.9992 135.85 97.1031C135.85 97.1481 135.843 97.1896 135.83 97.2277C135.816 97.2658 135.798 97.3021 135.778 97.3368L135.243 98.1936ZM137.874 98.5363L138.44 97.316L137.302 94.8546H137.796L138.689 96.8279L139.577 94.8546H140.075L138.372 98.5363H137.874ZM141.618 97.5029C141.421 97.5029 141.239 97.4683 141.073 97.3991C140.907 97.3264 140.763 97.2294 140.642 97.1083C140.521 96.9871 140.426 96.8452 140.357 96.6825C140.291 96.5163 140.258 96.3397 140.258 96.1528C140.258 95.9659 140.291 95.791 140.357 95.6283C140.426 95.4621 140.521 95.3185 140.642 95.1973C140.763 95.0761 140.907 94.9809 141.073 94.9117C141.239 94.839 141.421 94.8027 141.618 94.8027C141.812 94.8027 141.992 94.839 142.158 94.9117C142.325 94.9809 142.468 95.0761 142.589 95.1973C142.711 95.3185 142.804 95.4621 142.87 95.6283C142.939 95.791 142.974 95.9659 142.974 96.1528C142.974 96.3397 142.939 96.5163 142.87 96.6825C142.804 96.8452 142.711 96.9871 142.589 97.1083C142.468 97.2294 142.325 97.3264 142.158 97.3991C141.992 97.4683 141.812 97.5029 141.618 97.5029ZM141.618 97.0875C141.753 97.0875 141.876 97.0633 141.987 97.0148C142.098 96.9663 142.191 96.9006 142.268 96.8175C142.347 96.7309 142.408 96.6323 142.449 96.5215C142.494 96.4072 142.517 96.2843 142.517 96.1528C142.517 96.0247 142.494 95.9035 142.449 95.7893C142.408 95.6751 142.347 95.5764 142.268 95.4933C142.191 95.4068 142.098 95.3392 141.987 95.2908C141.876 95.2423 141.753 95.2181 141.618 95.2181C141.483 95.2181 141.36 95.2423 141.25 95.2908C141.139 95.3392 141.044 95.4068 140.964 95.4933C140.884 95.5764 140.822 95.6751 140.777 95.7893C140.736 95.9035 140.715 96.0247 140.715 96.1528C140.715 96.2843 140.736 96.4072 140.777 96.5215C140.822 96.6323 140.884 96.7309 140.964 96.8175C141.044 96.9006 141.139 96.9663 141.25 97.0148C141.36 97.0633 141.483 97.0875 141.618 97.0875ZM144.534 97.5029C144.392 97.5029 144.262 97.4787 144.144 97.4302C144.027 97.3783 143.926 97.3073 143.843 97.2173C143.76 97.1273 143.694 97.0183 143.646 96.8902C143.601 96.7586 143.578 96.6115 143.578 96.4488V94.8546H144.025V96.3813C144.025 96.5994 144.077 96.7725 144.181 96.9006C144.288 97.0287 144.432 97.0927 144.612 97.0927C144.712 97.0927 144.806 97.0719 144.892 97.0304C144.982 96.9854 145.058 96.9231 145.121 96.8434C145.186 96.7604 145.238 96.66 145.276 96.5423C145.315 96.4246 145.334 96.2913 145.334 96.1424V94.8546H145.78V97.451H145.334V97.0512C145.247 97.2035 145.133 97.3177 144.991 97.3939C144.852 97.4666 144.7 97.5029 144.534 97.5029ZM151.219 95.9243C151.219 95.7131 151.175 95.5418 151.089 95.4102C151.002 95.2787 150.874 95.2129 150.705 95.2129C150.497 95.2129 150.327 95.2942 150.196 95.457C150.068 95.6197 150 95.8412 149.993 96.1216V97.451H149.547V95.9243C149.547 95.7131 149.503 95.5418 149.417 95.4102C149.334 95.2787 149.207 95.2129 149.038 95.2129C148.827 95.2129 148.653 95.2977 148.518 95.4673C148.387 95.637 148.321 95.8689 148.321 96.1632V97.451H147.875V94.8546H148.321V95.2544C148.397 95.116 148.503 95.0069 148.638 94.9273C148.773 94.8442 148.929 94.8027 149.105 94.8027C149.299 94.8027 149.464 94.8529 149.599 94.9532C149.737 95.0502 149.839 95.1852 149.905 95.3583C149.974 95.1887 150.083 95.0536 150.232 94.9532C150.384 94.8529 150.559 94.8027 150.757 94.8027C150.898 94.8027 151.025 94.8286 151.136 94.8805C151.25 94.929 151.345 95 151.421 95.0935C151.501 95.1835 151.561 95.2942 151.603 95.4258C151.645 95.5539 151.665 95.6976 151.665 95.8568V97.451H151.219V95.9243ZM153.539 97.5029C153.355 97.5029 153.186 97.4683 153.03 97.3991C152.877 97.3264 152.744 97.2294 152.63 97.1083C152.516 96.9836 152.426 96.84 152.36 96.6773C152.298 96.5146 152.266 96.3397 152.266 96.1528C152.266 95.9659 152.298 95.791 152.36 95.6283C152.426 95.4656 152.516 95.3237 152.63 95.2025C152.744 95.0779 152.877 94.9809 153.03 94.9117C153.186 94.839 153.355 94.8027 153.539 94.8027C153.736 94.8027 153.916 94.8477 154.079 94.9377C154.241 95.0242 154.366 95.1298 154.453 95.2544V94.8546H154.899V97.451H154.453V97.0512C154.366 97.1758 154.241 97.2831 154.079 97.3731C153.916 97.4597 153.736 97.5029 153.539 97.5029ZM153.606 97.0927C153.738 97.0927 153.857 97.0685 153.965 97.02C154.072 96.9715 154.164 96.9058 154.24 96.8227C154.319 96.7361 154.38 96.6357 154.421 96.5215C154.466 96.4072 154.489 96.2843 154.489 96.1528C154.489 96.0212 154.466 95.8983 154.421 95.7841C154.38 95.6699 154.319 95.5712 154.24 95.4881C154.164 95.4016 154.072 95.3341 153.965 95.2856C153.857 95.2371 153.738 95.2129 153.606 95.2129C153.475 95.2129 153.353 95.2371 153.243 95.2856C153.135 95.3341 153.042 95.4016 152.962 95.4881C152.886 95.5712 152.826 95.6699 152.781 95.7841C152.739 95.8983 152.718 96.0212 152.718 96.1528C152.718 96.2843 152.739 96.4072 152.781 96.5215C152.826 96.6357 152.886 96.7361 152.962 96.8227C153.042 96.9058 153.135 96.9715 153.243 97.02C153.353 97.0685 153.475 97.0927 153.606 97.0927ZM155.932 98.5363L156.498 97.316L155.361 94.8546H155.854L156.747 96.8279L157.635 94.8546H158.134L156.431 98.5363H155.932ZM159.716 93.5564H160.162V97.451H159.716V93.5564ZM162.162 97.5029C161.964 97.5029 161.783 97.4683 161.616 97.3991C161.45 97.3264 161.307 97.2294 161.185 97.1083C161.064 96.9871 160.969 96.8452 160.9 96.6825C160.834 96.5163 160.801 96.3397 160.801 96.1528C160.801 95.9659 160.834 95.791 160.9 95.6283C160.969 95.4621 161.064 95.3185 161.185 95.1973C161.307 95.0761 161.45 94.9809 161.616 94.9117C161.783 94.839 161.964 94.8027 162.162 94.8027C162.355 94.8027 162.535 94.839 162.702 94.9117C162.868 94.9809 163.011 95.0761 163.133 95.1973C163.254 95.3185 163.347 95.4621 163.413 95.6283C163.482 95.791 163.517 95.9659 163.517 96.1528C163.517 96.3397 163.482 96.5163 163.413 96.6825C163.347 96.8452 163.254 96.9871 163.133 97.1083C163.011 97.2294 162.868 97.3264 162.702 97.3991C162.535 97.4683 162.355 97.5029 162.162 97.5029ZM162.162 97.0875C162.297 97.0875 162.42 97.0633 162.53 97.0148C162.641 96.9663 162.735 96.9006 162.811 96.8175C162.89 96.7309 162.951 96.6323 162.992 96.5215C163.037 96.4072 163.06 96.2843 163.06 96.1528C163.06 96.0247 163.037 95.9035 162.992 95.7893C162.951 95.6751 162.89 95.5764 162.811 95.4933C162.735 95.4068 162.641 95.3392 162.53 95.2908C162.42 95.2423 162.297 95.2181 162.162 95.2181C162.027 95.2181 161.904 95.2423 161.793 95.2908C161.682 95.3392 161.587 95.4068 161.507 95.4933C161.428 95.5764 161.365 95.6751 161.32 95.7893C161.279 95.9035 161.258 96.0247 161.258 96.1528C161.258 96.2843 161.279 96.4072 161.32 96.5215C161.365 96.6323 161.428 96.7309 161.507 96.8175C161.587 96.9006 161.682 96.9663 161.793 97.0148C161.904 97.0633 162.027 97.0875 162.162 97.0875ZM164.937 97.5029C164.705 97.5029 164.497 97.4545 164.314 97.3575C164.13 97.2571 163.999 97.1048 163.919 96.9006L164.283 96.698C164.331 96.8296 164.416 96.9317 164.537 97.0044C164.662 97.0737 164.797 97.1083 164.942 97.1083C165.067 97.1083 165.172 97.0789 165.259 97.02C165.349 96.9577 165.394 96.8711 165.394 96.7604C165.394 96.6669 165.361 96.589 165.295 96.5267C165.23 96.4644 165.112 96.4072 164.942 96.3553L164.683 96.2722C164.468 96.2099 164.305 96.1147 164.194 95.9866C164.087 95.8551 164.033 95.6976 164.033 95.5141C164.033 95.4033 164.056 95.3046 164.101 95.2181C164.149 95.1281 164.213 95.0536 164.293 94.9948C164.376 94.9325 164.471 94.8857 164.579 94.8546C164.686 94.82 164.802 94.8027 164.927 94.8027C165.12 94.8027 165.29 94.8425 165.436 94.9221C165.581 94.9983 165.697 95.109 165.783 95.2544L165.451 95.4829C165.392 95.3998 165.318 95.3306 165.228 95.2752C165.141 95.2163 165.036 95.1869 164.911 95.1869C164.8 95.1869 164.7 95.2146 164.61 95.27C164.523 95.3254 164.48 95.4016 164.48 95.4985C164.48 95.5781 164.504 95.6491 164.553 95.7114C164.605 95.7737 164.703 95.8274 164.849 95.8724L165.134 95.9607C165.359 96.0299 165.532 96.1251 165.654 96.2463C165.778 96.3674 165.841 96.5267 165.841 96.724C165.841 96.8486 165.818 96.9594 165.773 97.0563C165.728 97.1533 165.664 97.2346 165.581 97.3004C165.501 97.3662 165.406 97.4164 165.295 97.451C165.185 97.4856 165.065 97.5029 164.937 97.5029ZM167.633 97.5029C167.432 97.5029 167.249 97.4683 167.083 97.3991C166.916 97.3298 166.775 97.2346 166.657 97.1135C166.539 96.9923 166.447 96.8504 166.382 96.6877C166.319 96.5215 166.288 96.3432 166.288 96.1528C166.288 95.9624 166.321 95.7858 166.387 95.6231C166.453 95.457 166.544 95.3133 166.662 95.1921C166.783 95.071 166.927 94.9757 167.093 94.9065C167.259 94.8373 167.441 94.8027 167.638 94.8027C167.808 94.8027 167.967 94.8321 168.116 94.8909C168.265 94.9463 168.395 95.0311 168.505 95.1454C168.62 95.2562 168.71 95.3929 168.776 95.5556C168.841 95.7149 168.874 95.8983 168.874 96.1061C168.874 96.1303 168.874 96.1528 168.874 96.1736C168.874 96.1909 168.872 96.2134 168.869 96.2411H166.74C166.743 96.3622 166.768 96.4747 166.813 96.5786C166.861 96.6825 166.923 96.7725 167 96.8486C167.079 96.9248 167.173 96.9854 167.28 97.0304C167.391 97.0719 167.51 97.0927 167.638 97.0927C167.839 97.0927 168.004 97.0529 168.132 96.9733C168.263 96.8902 168.369 96.7794 168.448 96.6409L168.801 96.885C168.684 97.0754 168.526 97.226 168.329 97.3368C168.135 97.4475 167.903 97.5029 167.633 97.5029ZM168.417 95.8776C168.4 95.7703 168.367 95.6751 168.319 95.592C168.274 95.5089 168.215 95.4379 168.142 95.3791C168.073 95.3202 167.993 95.2752 167.903 95.244C167.813 95.2129 167.72 95.1973 167.623 95.1973C167.526 95.1973 167.431 95.2129 167.337 95.244C167.244 95.2752 167.159 95.3202 167.083 95.3791C167.006 95.4344 166.941 95.5054 166.885 95.592C166.83 95.6751 166.792 95.7703 166.771 95.8776H168.417ZM171.83 97.5029C171.647 97.5029 171.477 97.4683 171.321 97.3991C171.169 97.3264 171.036 97.2294 170.922 97.1083C170.807 96.9836 170.717 96.84 170.652 96.6773C170.589 96.5146 170.558 96.3397 170.558 96.1528C170.558 95.9659 170.589 95.791 170.652 95.6283C170.717 95.4656 170.807 95.3237 170.922 95.2025C171.036 95.0779 171.169 94.9809 171.321 94.9117C171.477 94.839 171.647 94.8027 171.83 94.8027C172.028 94.8027 172.208 94.8477 172.37 94.9377C172.533 95.0242 172.658 95.1298 172.744 95.2544V94.8546H173.191V97.451H172.744V97.0512C172.658 97.1758 172.533 97.2831 172.37 97.3731C172.208 97.4597 172.028 97.5029 171.83 97.5029ZM171.898 97.0927C172.029 97.0927 172.149 97.0685 172.256 97.02C172.363 96.9715 172.455 96.9058 172.531 96.8227C172.611 96.7361 172.672 96.6357 172.713 96.5215C172.758 96.4072 172.781 96.2843 172.781 96.1528C172.781 96.0212 172.758 95.8983 172.713 95.7841C172.672 95.6699 172.611 95.5712 172.531 95.4881C172.455 95.4016 172.363 95.3341 172.256 95.2856C172.149 95.2371 172.029 95.2129 171.898 95.2129C171.766 95.2129 171.645 95.2371 171.534 95.2856C171.427 95.3341 171.334 95.4016 171.254 95.4881C171.178 95.5712 171.117 95.6699 171.072 95.7841C171.031 95.8983 171.01 96.0212 171.01 96.1528C171.01 96.2843 171.031 96.4072 171.072 96.5215C171.117 96.6357 171.178 96.7361 171.254 96.8227C171.334 96.9058 171.427 96.9715 171.534 97.02C171.645 97.0685 171.766 97.0927 171.898 97.0927ZM174.031 93.5564H174.478V97.451H174.031V93.5564ZM175.325 93.5564H175.771V97.451H175.325V93.5564ZM82.3774 105.503C82.1801 105.503 81.9983 105.468 81.8321 105.399C81.666 105.326 81.5223 105.229 81.4011 105.108C81.28 104.987 81.1848 104.845 81.1155 104.682C81.0497 104.516 81.0169 104.34 81.0169 104.153C81.0169 103.966 81.0497 103.791 81.1155 103.628C81.1848 103.462 81.28 103.318 81.4011 103.197C81.5223 103.076 81.666 102.981 81.8321 102.912C81.9983 102.839 82.1801 102.803 82.3774 102.803C82.5713 102.803 82.7513 102.839 82.9174 102.912C83.0836 102.981 83.2273 103.076 83.3484 103.197C83.4696 103.318 83.5631 103.462 83.6289 103.628C83.6981 103.791 83.7327 103.966 83.7327 104.153C83.7327 104.34 83.6981 104.516 83.6289 104.682C83.5631 104.845 83.4696 104.987 83.3484 105.108C83.2273 105.229 83.0836 105.326 82.9174 105.399C82.7513 105.468 82.5713 105.503 82.3774 105.503ZM82.3774 105.088C82.5124 105.088 82.6353 105.063 82.7461 105.015C82.8569 104.966 82.9503 104.901 83.0265 104.817C83.1061 104.731 83.1667 104.632 83.2082 104.521C83.2532 104.407 83.2757 104.284 83.2757 104.153C83.2757 104.025 83.2532 103.904 83.2082 103.789C83.1667 103.675 83.1061 103.576 83.0265 103.493C82.9503 103.407 82.8569 103.339 82.7461 103.291C82.6353 103.242 82.5124 103.218 82.3774 103.218C82.2424 103.218 82.1195 103.242 82.0087 103.291C81.8979 103.339 81.8027 103.407 81.7231 103.493C81.6435 103.576 81.5812 103.675 81.5361 103.789C81.4946 103.904 81.4738 104.025 81.4738 104.153C81.4738 104.284 81.4946 104.407 81.5361 104.521C81.5812 104.632 81.6435 104.731 81.7231 104.817C81.8027 104.901 81.8979 104.966 82.0087 105.015C82.1195 105.063 82.2424 105.088 82.3774 105.088ZM84.5513 103.265H84.0008V102.855H84.5513V102.33C84.5513 102.195 84.5703 102.077 84.6084 101.977C84.6499 101.877 84.7053 101.794 84.7746 101.728C84.8473 101.658 84.9321 101.608 85.029 101.577C85.126 101.543 85.2315 101.525 85.3458 101.525C85.4254 101.525 85.4981 101.532 85.5639 101.546C85.6297 101.556 85.692 101.572 85.7508 101.593V101.987C85.7093 101.97 85.6574 101.958 85.595 101.951C85.5362 101.941 85.4808 101.935 85.4289 101.935C85.2835 101.935 85.1744 101.968 85.1017 102.034C85.0325 102.096 84.9979 102.211 84.9979 102.377V102.855H85.7508V103.265H84.9979V105.451H84.5513V103.265ZM87.426 106.536L87.992 105.316L86.8548 102.855H87.3481L88.2413 104.828L89.1293 102.855H89.6278L87.9245 106.536H87.426ZM91.1707 105.503C90.9734 105.503 90.7917 105.468 90.6255 105.399C90.4593 105.326 90.3157 105.229 90.1945 105.108C90.0733 104.987 89.9781 104.845 89.9089 104.682C89.8431 104.516 89.8102 104.34 89.8102 104.153C89.8102 103.966 89.8431 103.791 89.9089 103.628C89.9781 103.462 90.0733 103.318 90.1945 103.197C90.3157 103.076 90.4593 102.981 90.6255 102.912C90.7917 102.839 90.9734 102.803 91.1707 102.803C91.3646 102.803 91.5446 102.839 91.7108 102.912C91.877 102.981 92.0206 103.076 92.1418 103.197C92.263 103.318 92.3564 103.462 92.4222 103.628C92.4915 103.791 92.5261 103.966 92.5261 104.153C92.5261 104.34 92.4915 104.516 92.4222 104.682C92.3564 104.845 92.263 104.987 92.1418 105.108C92.0206 105.229 91.877 105.326 91.7108 105.399C91.5446 105.468 91.3646 105.503 91.1707 105.503ZM91.1707 105.088C91.3058 105.088 91.4287 105.063 91.5394 105.015C91.6502 104.966 91.7437 104.901 91.8198 104.817C91.8995 104.731 91.9601 104.632 92.0016 104.521C92.0466 104.407 92.0691 104.284 92.0691 104.153C92.0691 104.025 92.0466 103.904 92.0016 103.789C91.9601 103.675 91.8995 103.576 91.8198 103.493C91.7437 103.407 91.6502 103.339 91.5394 103.291C91.4287 103.242 91.3058 103.218 91.1707 103.218C91.0357 103.218 90.9128 103.242 90.802 103.291C90.6913 103.339 90.5961 103.407 90.5164 103.493C90.4368 103.576 90.3745 103.675 90.3295 103.789C90.288 103.904 90.2672 104.025 90.2672 104.153C90.2672 104.284 90.288 104.407 90.3295 104.521C90.3745 104.632 90.4368 104.731 90.5164 104.817C90.5961 104.901 90.6913 104.966 90.802 105.015C90.9128 105.063 91.0357 105.088 91.1707 105.088ZM94.0862 105.503C93.9443 105.503 93.8145 105.479 93.6968 105.43C93.5791 105.378 93.4787 105.307 93.3956 105.217C93.3125 105.127 93.2467 105.018 93.1983 104.89C93.1533 104.759 93.1308 104.611 93.1308 104.449V102.855H93.5773V104.381C93.5773 104.599 93.6293 104.772 93.7331 104.901C93.8404 105.029 93.9841 105.093 94.1641 105.093C94.2645 105.093 94.358 105.072 94.4445 105.03C94.5346 104.985 94.6107 104.923 94.673 104.843C94.7388 104.76 94.7907 104.66 94.8288 104.542C94.8669 104.425 94.8859 104.291 94.8859 104.142V102.855H95.3325V105.451H94.8859V105.051C94.7994 105.203 94.6851 105.318 94.5432 105.394C94.4047 105.467 94.2524 105.503 94.0862 105.503ZM96.1743 102.855H96.6209V103.358C96.6451 103.275 96.6832 103.201 96.7351 103.135C96.787 103.069 96.8459 103.014 96.9117 102.969C96.9774 102.924 97.0467 102.889 97.1194 102.865C97.1955 102.841 97.2717 102.829 97.3479 102.829C97.4171 102.829 97.4846 102.836 97.5504 102.849V103.312C97.5088 103.294 97.469 103.284 97.431 103.28C97.3929 103.273 97.3513 103.27 97.3063 103.27C97.2232 103.27 97.1402 103.289 97.0571 103.327C96.9774 103.362 96.9047 103.415 96.839 103.488C96.7767 103.561 96.7247 103.654 96.6832 103.769C96.6416 103.879 96.6209 104.011 96.6209 104.163V105.451H96.1743V102.855ZM100.266 105.503C100.083 105.503 99.9133 105.468 99.7575 105.399C99.6052 105.326 99.4719 105.229 99.3577 105.108C99.2434 104.984 99.1534 104.84 99.0876 104.677C99.0253 104.515 98.9942 104.34 98.9942 104.153C98.9942 103.966 99.0253 103.791 99.0876 103.628C99.1534 103.466 99.2434 103.324 99.3577 103.203C99.4719 103.078 99.6052 102.981 99.7575 102.912C99.9133 102.839 100.083 102.803 100.266 102.803C100.464 102.803 100.644 102.848 100.806 102.938C100.969 103.024 101.094 103.13 101.18 103.254V102.855H101.627V105.451H101.18V105.051C101.094 105.176 100.969 105.283 100.806 105.373C100.644 105.46 100.464 105.503 100.266 105.503ZM100.334 105.093C100.465 105.093 100.585 105.068 100.692 105.02C100.8 104.972 100.891 104.906 100.967 104.823C101.047 104.736 101.108 104.636 101.149 104.521C101.194 104.407 101.217 104.284 101.217 104.153C101.217 104.021 101.194 103.898 101.149 103.784C101.108 103.67 101.047 103.571 100.967 103.488C100.891 103.402 100.8 103.334 100.692 103.286C100.585 103.237 100.465 103.213 100.334 103.213C100.202 103.213 100.081 103.237 99.9704 103.286C99.8631 103.334 99.7696 103.402 99.69 103.488C99.6138 103.571 99.5533 103.67 99.5083 103.784C99.4667 103.898 99.4459 104.021 99.4459 104.153C99.4459 104.284 99.4667 104.407 99.5083 104.521C99.5533 104.636 99.6138 104.736 99.69 104.823C99.7696 104.906 99.8631 104.972 99.9704 105.02C100.081 105.068 100.202 105.093 100.334 105.093ZM103.252 105.503C103.02 105.503 102.812 105.454 102.629 105.358C102.445 105.257 102.314 105.105 102.234 104.901L102.597 104.698C102.646 104.83 102.731 104.932 102.852 105.004C102.976 105.074 103.111 105.108 103.257 105.108C103.382 105.108 103.487 105.079 103.574 105.02C103.664 104.958 103.709 104.871 103.709 104.76C103.709 104.667 103.676 104.589 103.61 104.527C103.544 104.464 103.427 104.407 103.257 104.355L102.997 104.272C102.783 104.21 102.62 104.115 102.509 103.987C102.402 103.855 102.348 103.698 102.348 103.514C102.348 103.403 102.371 103.305 102.416 103.218C102.464 103.128 102.528 103.054 102.608 102.995C102.691 102.932 102.786 102.886 102.893 102.855C103.001 102.82 103.117 102.803 103.241 102.803C103.435 102.803 103.605 102.842 103.75 102.922C103.896 102.998 104.012 103.109 104.098 103.254L103.766 103.483C103.707 103.4 103.632 103.331 103.542 103.275C103.456 103.216 103.35 103.187 103.226 103.187C103.115 103.187 103.015 103.215 102.925 103.27C102.838 103.325 102.795 103.402 102.795 103.498C102.795 103.578 102.819 103.649 102.867 103.711C102.919 103.774 103.018 103.827 103.163 103.872L103.449 103.961C103.674 104.03 103.847 104.125 103.968 104.246C104.093 104.367 104.155 104.527 104.155 104.724C104.155 104.849 104.133 104.959 104.088 105.056C104.043 105.153 103.979 105.235 103.896 105.3C103.816 105.366 103.721 105.416 103.61 105.451C103.499 105.486 103.38 105.503 103.252 105.503ZM105.589 105.503C105.358 105.503 105.15 105.454 104.966 105.358C104.783 105.257 104.651 105.105 104.572 104.901L104.935 104.698C104.984 104.83 105.068 104.932 105.19 105.004C105.314 105.074 105.449 105.108 105.595 105.108C105.719 105.108 105.825 105.079 105.911 105.02C106.001 104.958 106.046 104.871 106.046 104.76C106.046 104.667 106.014 104.589 105.948 104.527C105.882 104.464 105.764 104.407 105.595 104.355L105.335 104.272C105.12 104.21 104.958 104.115 104.847 103.987C104.74 103.855 104.686 103.698 104.686 103.514C104.686 103.403 104.708 103.305 104.753 103.218C104.802 103.128 104.866 103.054 104.946 102.995C105.029 102.932 105.124 102.886 105.231 102.855C105.338 102.82 105.454 102.803 105.579 102.803C105.773 102.803 105.943 102.842 106.088 102.922C106.233 102.998 106.349 103.109 106.436 103.254L106.104 103.483C106.045 103.4 105.97 103.331 105.88 103.275C105.794 103.216 105.688 103.187 105.564 103.187C105.453 103.187 105.352 103.215 105.262 103.27C105.176 103.325 105.133 103.402 105.133 103.498C105.133 103.578 105.157 103.649 105.205 103.711C105.257 103.774 105.356 103.827 105.501 103.872L105.787 103.961C106.012 104.03 106.185 104.125 106.306 104.246C106.431 104.367 106.493 104.527 106.493 104.724C106.493 104.849 106.471 104.959 106.426 105.056C106.381 105.153 106.316 105.235 106.233 105.3C106.154 105.366 106.059 105.416 105.948 105.451C105.837 105.486 105.718 105.503 105.589 105.503ZM108.286 105.503C108.085 105.503 107.901 105.468 107.735 105.399C107.569 105.33 107.427 105.235 107.309 105.113C107.192 104.992 107.1 104.85 107.034 104.688C106.972 104.521 106.941 104.343 106.941 104.153C106.941 103.962 106.974 103.786 107.039 103.623C107.105 103.457 107.197 103.313 107.315 103.192C107.436 103.071 107.579 102.976 107.746 102.907C107.912 102.837 108.093 102.803 108.291 102.803C108.46 102.803 108.62 102.832 108.769 102.891C108.917 102.946 109.047 103.031 109.158 103.145C109.272 103.256 109.362 103.393 109.428 103.556C109.494 103.715 109.527 103.898 109.527 104.106C109.527 104.13 109.527 104.153 109.527 104.174C109.527 104.191 109.525 104.213 109.521 104.241H107.392C107.396 104.362 107.42 104.475 107.465 104.579C107.514 104.682 107.576 104.772 107.652 104.849C107.732 104.925 107.825 104.985 107.932 105.03C108.043 105.072 108.163 105.093 108.291 105.093C108.492 105.093 108.656 105.053 108.784 104.973C108.916 104.89 109.021 104.779 109.101 104.641L109.454 104.885C109.336 105.075 109.179 105.226 108.981 105.337C108.788 105.448 108.556 105.503 108.286 105.503ZM109.07 103.878C109.052 103.77 109.02 103.675 108.971 103.592C108.926 103.509 108.867 103.438 108.794 103.379C108.725 103.32 108.646 103.275 108.556 103.244C108.466 103.213 108.372 103.197 108.275 103.197C108.178 103.197 108.083 103.213 107.99 103.244C107.896 103.275 107.811 103.32 107.735 103.379C107.659 103.434 107.593 103.505 107.538 103.592C107.482 103.675 107.444 103.77 107.424 103.878H109.07ZM111.132 105.477C111.018 105.477 110.913 105.461 110.816 105.43C110.719 105.396 110.634 105.347 110.561 105.285C110.492 105.219 110.437 105.136 110.395 105.036C110.357 104.935 110.338 104.817 110.338 104.682V103.265H109.787V102.855H110.338V102.133H110.784V102.855H111.532V103.265H110.784V104.625C110.784 104.792 110.821 104.907 110.894 104.973C110.966 105.036 111.074 105.067 111.215 105.067C111.271 105.067 111.326 105.063 111.382 105.056C111.441 105.046 111.491 105.032 111.532 105.015V105.415C111.477 105.432 111.416 105.446 111.35 105.456C111.285 105.47 111.212 105.477 111.132 105.477ZM112.887 105.503C112.655 105.503 112.447 105.454 112.264 105.358C112.08 105.257 111.949 105.105 111.869 104.901L112.233 104.698C112.281 104.83 112.366 104.932 112.487 105.004C112.612 105.074 112.747 105.108 112.892 105.108C113.017 105.108 113.122 105.079 113.209 105.02C113.299 104.958 113.344 104.871 113.344 104.76C113.344 104.667 113.311 104.589 113.245 104.527C113.179 104.464 113.062 104.407 112.892 104.355L112.632 104.272C112.418 104.21 112.255 104.115 112.144 103.987C112.037 103.855 111.983 103.698 111.983 103.514C111.983 103.403 112.006 103.305 112.051 103.218C112.099 103.128 112.163 103.054 112.243 102.995C112.326 102.932 112.421 102.886 112.529 102.855C112.636 102.82 112.752 102.803 112.876 102.803C113.07 102.803 113.24 102.842 113.385 102.922C113.531 102.998 113.647 103.109 113.733 103.254L113.401 103.483C113.342 103.4 113.268 103.331 113.178 103.275C113.091 103.216 112.986 103.187 112.861 103.187C112.75 103.187 112.65 103.215 112.56 103.27C112.473 103.325 112.43 103.402 112.43 103.498C112.43 103.578 112.454 103.649 112.503 103.711C112.555 103.774 112.653 103.827 112.799 103.872L113.084 103.961C113.309 104.03 113.482 104.125 113.603 104.246C113.728 104.367 113.79 104.527 113.79 104.724C113.79 104.849 113.768 104.959 113.723 105.056C113.678 105.153 113.614 105.235 113.531 105.3C113.451 105.366 113.356 105.416 113.245 105.451C113.134 105.486 113.015 105.503 112.887 105.503ZM115.845 103.265H115.295V102.855H115.845V102.33C115.845 102.195 115.864 102.077 115.902 101.977C115.944 101.877 115.999 101.794 116.069 101.728C116.141 101.658 116.226 101.608 116.323 101.577C116.42 101.543 116.526 101.525 116.64 101.525C116.719 101.525 116.792 101.532 116.858 101.546C116.924 101.556 116.986 101.572 117.045 101.593V101.987C117.003 101.97 116.951 101.958 116.889 101.951C116.83 101.941 116.775 101.935 116.723 101.935C116.577 101.935 116.468 101.968 116.396 102.034C116.326 102.096 116.292 102.211 116.292 102.377V102.855H117.045V103.265H116.292V105.451H115.845V103.265ZM118.621 105.503C118.423 105.503 118.242 105.468 118.076 105.399C117.909 105.326 117.766 105.229 117.645 105.108C117.523 104.987 117.428 104.845 117.359 104.682C117.293 104.516 117.26 104.34 117.26 104.153C117.26 103.966 117.293 103.791 117.359 103.628C117.428 103.462 117.523 103.318 117.645 103.197C117.766 103.076 117.909 102.981 118.076 102.912C118.242 102.839 118.423 102.803 118.621 102.803C118.815 102.803 118.995 102.839 119.161 102.912C119.327 102.981 119.471 103.076 119.592 103.197C119.713 103.318 119.807 103.462 119.872 103.628C119.942 103.791 119.976 103.966 119.976 104.153C119.976 104.34 119.942 104.516 119.872 104.682C119.807 104.845 119.713 104.987 119.592 105.108C119.471 105.229 119.327 105.326 119.161 105.399C118.995 105.468 118.815 105.503 118.621 105.503ZM118.621 105.088C118.756 105.088 118.879 105.063 118.989 105.015C119.1 104.966 119.194 104.901 119.27 104.817C119.35 104.731 119.41 104.632 119.452 104.521C119.497 104.407 119.519 104.284 119.519 104.153C119.519 104.025 119.497 103.904 119.452 103.789C119.41 103.675 119.35 103.576 119.27 103.493C119.194 103.407 119.1 103.339 118.989 103.291C118.879 103.242 118.756 103.218 118.621 103.218C118.486 103.218 118.363 103.242 118.252 103.291C118.141 103.339 118.046 103.407 117.967 103.493C117.887 103.576 117.825 103.675 117.78 103.789C117.738 103.904 117.717 104.025 117.717 104.153C117.717 104.284 117.738 104.407 117.78 104.521C117.825 104.632 117.887 104.731 117.967 104.817C118.046 104.901 118.141 104.966 118.252 105.015C118.363 105.063 118.486 105.088 118.621 105.088ZM120.617 102.855H121.064V103.358C121.088 103.275 121.126 103.201 121.178 103.135C121.23 103.069 121.289 103.014 121.355 102.969C121.42 102.924 121.49 102.889 121.562 102.865C121.638 102.841 121.715 102.829 121.791 102.829C121.86 102.829 121.927 102.836 121.993 102.849V103.312C121.952 103.294 121.912 103.284 121.874 103.28C121.836 103.273 121.794 103.27 121.749 103.27C121.666 103.27 121.583 103.289 121.5 103.327C121.42 103.362 121.348 103.415 121.282 103.488C121.22 103.561 121.168 103.654 121.126 103.769C121.085 103.879 121.064 104.011 121.064 104.163V105.451H120.617V102.855ZM124.772 105.03C124.9 105.03 125.017 105.008 125.125 104.963C125.235 104.918 125.329 104.856 125.405 104.776C125.481 104.693 125.54 104.596 125.582 104.485C125.627 104.374 125.649 104.253 125.649 104.122C125.649 103.994 125.627 103.874 125.582 103.763C125.54 103.649 125.481 103.552 125.405 103.473C125.329 103.393 125.235 103.331 125.125 103.286C125.017 103.237 124.9 103.213 124.772 103.213C124.64 103.213 124.521 103.237 124.413 103.286C124.306 103.331 124.214 103.393 124.138 103.473C124.062 103.552 124.001 103.649 123.956 103.763C123.915 103.874 123.894 103.994 123.894 104.122C123.894 104.253 123.915 104.374 123.956 104.485C124.001 104.596 124.062 104.693 124.138 104.776C124.214 104.856 124.306 104.918 124.413 104.963C124.521 105.008 124.64 105.03 124.772 105.03ZM124.746 106.588C124.465 106.588 124.219 106.536 124.008 106.432C123.797 106.329 123.636 106.204 123.525 106.059L123.837 105.747C123.941 105.879 124.067 105.984 124.216 106.064C124.368 106.143 124.545 106.183 124.746 106.183C124.856 106.183 124.964 106.166 125.068 106.131C125.171 106.097 125.263 106.041 125.343 105.965C125.426 105.892 125.492 105.799 125.54 105.685C125.589 105.574 125.613 105.441 125.613 105.285V104.989C125.523 105.12 125.398 105.229 125.239 105.316C125.08 105.403 124.903 105.446 124.709 105.446C124.529 105.446 124.361 105.413 124.206 105.347C124.05 105.278 123.915 105.184 123.801 105.067C123.686 104.946 123.596 104.805 123.531 104.646C123.468 104.483 123.437 104.309 123.437 104.122C123.437 103.938 123.468 103.767 123.531 103.608C123.596 103.445 123.686 103.305 123.801 103.187C123.915 103.066 124.05 102.972 124.206 102.907C124.361 102.837 124.529 102.803 124.709 102.803C124.903 102.803 125.08 102.846 125.239 102.932C125.398 103.016 125.523 103.123 125.613 103.254V102.855H126.059V105.3C126.059 105.519 126.025 105.707 125.956 105.866C125.89 106.029 125.798 106.162 125.68 106.266C125.563 106.374 125.424 106.453 125.265 106.505C125.106 106.561 124.933 106.588 124.746 106.588ZM128.053 105.503C127.856 105.503 127.674 105.468 127.508 105.399C127.342 105.326 127.198 105.229 127.077 105.108C126.956 104.987 126.86 104.845 126.791 104.682C126.725 104.516 126.693 104.34 126.693 104.153C126.693 103.966 126.725 103.791 126.791 103.628C126.86 103.462 126.956 103.318 127.077 103.197C127.198 103.076 127.342 102.981 127.508 102.912C127.674 102.839 127.856 102.803 128.053 102.803C128.247 102.803 128.427 102.839 128.593 102.912C128.759 102.981 128.903 103.076 129.024 103.197C129.145 103.318 129.239 103.462 129.305 103.628C129.374 103.791 129.408 103.966 129.408 104.153C129.408 104.34 129.374 104.516 129.305 104.682C129.239 104.845 129.145 104.987 129.024 105.108C128.903 105.229 128.759 105.326 128.593 105.399C128.427 105.468 128.247 105.503 128.053 105.503ZM128.053 105.088C128.188 105.088 128.311 105.063 128.422 105.015C128.533 104.966 128.626 104.901 128.702 104.817C128.782 104.731 128.842 104.632 128.884 104.521C128.929 104.407 128.951 104.284 128.951 104.153C128.951 104.025 128.929 103.904 128.884 103.789C128.842 103.675 128.782 103.576 128.702 103.493C128.626 103.407 128.533 103.339 128.422 103.291C128.311 103.242 128.188 103.218 128.053 103.218C127.918 103.218 127.795 103.242 127.684 103.291C127.574 103.339 127.478 103.407 127.399 103.493C127.319 103.576 127.257 103.675 127.212 103.789C127.17 103.904 127.15 104.025 127.15 104.153C127.15 104.284 127.17 104.407 127.212 104.521C127.257 104.632 127.319 104.731 127.399 104.817C127.478 104.901 127.574 104.966 127.684 105.015C127.795 105.063 127.918 105.088 128.053 105.088ZM131.202 105.503C131.005 105.503 130.823 105.468 130.657 105.399C130.491 105.326 130.347 105.229 130.226 105.108C130.105 104.987 130.01 104.845 129.94 104.682C129.875 104.516 129.842 104.34 129.842 104.153C129.842 103.966 129.875 103.791 129.94 103.628C130.01 103.462 130.105 103.318 130.226 103.197C130.347 103.076 130.491 102.981 130.657 102.912C130.823 102.839 131.005 102.803 131.202 102.803C131.396 102.803 131.576 102.839 131.742 102.912C131.909 102.981 132.052 103.076 132.173 103.197C132.295 103.318 132.388 103.462 132.454 103.628C132.523 103.791 132.558 103.966 132.558 104.153C132.558 104.34 132.523 104.516 132.454 104.682C132.388 104.845 132.295 104.987 132.173 105.108C132.052 105.229 131.909 105.326 131.742 105.399C131.576 105.468 131.396 105.503 131.202 105.503ZM131.202 105.088C131.337 105.088 131.46 105.063 131.571 105.015C131.682 104.966 131.775 104.901 131.851 104.817C131.931 104.731 131.992 104.632 132.033 104.521C132.078 104.407 132.101 104.284 132.101 104.153C132.101 104.025 132.078 103.904 132.033 103.789C131.992 103.675 131.931 103.576 131.851 103.493C131.775 103.407 131.682 103.339 131.571 103.291C131.46 103.242 131.337 103.218 131.202 103.218C131.067 103.218 130.944 103.242 130.834 103.291C130.723 103.339 130.628 103.407 130.548 103.493C130.468 103.576 130.406 103.675 130.361 103.789C130.32 103.904 130.299 104.025 130.299 104.153C130.299 104.284 130.32 104.407 130.361 104.521C130.406 104.632 130.468 104.731 130.548 104.817C130.628 104.901 130.723 104.966 130.834 105.015C130.944 105.063 131.067 105.088 131.202 105.088ZM134.268 105.503C134.085 105.503 133.915 105.468 133.759 105.399C133.607 105.326 133.474 105.229 133.36 105.108C133.245 104.984 133.155 104.84 133.09 104.677C133.027 104.515 132.996 104.34 132.996 104.153C132.996 103.966 133.027 103.791 133.09 103.628C133.155 103.466 133.245 103.324 133.36 103.203C133.474 103.078 133.607 102.981 133.759 102.912C133.915 102.839 134.085 102.803 134.268 102.803C134.466 102.803 134.646 102.848 134.808 102.938C134.971 103.024 135.096 103.13 135.182 103.254V101.556H135.629V105.451H135.182V105.051C135.096 105.176 134.971 105.283 134.808 105.373C134.646 105.46 134.466 105.503 134.268 105.503ZM134.336 105.093C134.467 105.093 134.587 105.068 134.694 105.02C134.802 104.972 134.893 104.906 134.969 104.823C135.049 104.736 135.11 104.636 135.151 104.521C135.196 104.407 135.219 104.284 135.219 104.153C135.219 104.021 135.196 103.898 135.151 103.784C135.11 103.67 135.049 103.571 134.969 103.488C134.893 103.402 134.802 103.334 134.694 103.286C134.587 103.237 134.467 103.213 134.336 103.213C134.204 103.213 134.083 103.237 133.972 103.286C133.865 103.334 133.772 103.402 133.692 103.488C133.616 103.571 133.555 103.67 133.51 103.784C133.469 103.898 133.448 104.021 133.448 104.153C133.448 104.284 133.469 104.407 133.51 104.521C133.555 104.636 133.616 104.736 133.692 104.823C133.772 104.906 133.865 104.972 133.972 105.02C134.083 105.068 134.204 105.093 134.336 105.093ZM136.703 105.493C136.596 105.493 136.504 105.454 136.428 105.378C136.355 105.302 136.319 105.21 136.319 105.103C136.319 104.999 136.355 104.909 136.428 104.833C136.504 104.753 136.596 104.714 136.703 104.714C136.811 104.714 136.901 104.753 136.973 104.833C137.049 104.909 137.087 104.999 137.087 105.103C137.087 105.21 137.049 105.302 136.973 105.378C136.901 105.454 136.811 105.493 136.703 105.493ZM168.352 105.493C168.245 105.493 168.153 105.454 168.077 105.378C168.004 105.302 167.968 105.21 167.968 105.103C167.968 104.999 168.004 104.909 168.077 104.833C168.153 104.753 168.245 104.714 168.352 104.714C168.46 104.714 168.55 104.753 168.622 104.833C168.698 104.909 168.736 104.999 168.736 105.103C168.736 105.21 168.698 105.302 168.622 105.378C168.55 105.454 168.46 105.493 168.352 105.493Z" fill="#24272A"/>
-<path d="M140.351 101.764H140.833V104.994H142.615V105.451H140.351V101.764ZM144.189 105.503C143.988 105.503 143.805 105.468 143.639 105.399C143.473 105.33 143.331 105.235 143.213 105.113C143.095 104.992 143.004 104.85 142.938 104.688C142.875 104.521 142.844 104.343 142.844 104.153C142.844 103.962 142.877 103.786 142.943 103.623C143.009 103.457 143.1 103.313 143.218 103.192C143.339 103.071 143.483 102.976 143.649 102.907C143.815 102.837 143.997 102.803 144.194 102.803C144.364 102.803 144.523 102.832 144.672 102.891C144.821 102.946 144.951 103.031 145.062 103.145C145.176 103.256 145.266 103.393 145.332 103.556C145.397 103.715 145.43 103.898 145.43 104.106C145.43 104.13 145.43 104.153 145.43 104.174C145.43 104.191 145.429 104.213 145.425 104.241H143.296C143.3 104.362 143.324 104.475 143.369 104.579C143.417 104.682 143.48 104.772 143.556 104.849C143.635 104.925 143.729 104.985 143.836 105.03C143.947 105.072 144.066 105.093 144.194 105.093C144.395 105.093 144.56 105.053 144.688 104.973C144.819 104.89 144.925 104.779 145.005 104.641L145.358 104.885C145.24 105.075 145.082 105.226 144.885 105.337C144.691 105.448 144.459 105.503 144.189 105.503ZM144.973 103.878C144.956 103.77 144.923 103.675 144.875 103.592C144.83 103.509 144.771 103.438 144.698 103.379C144.629 103.32 144.549 103.275 144.459 103.244C144.369 103.213 144.276 103.197 144.179 103.197C144.082 103.197 143.987 103.213 143.893 103.244C143.8 103.275 143.715 103.32 143.639 103.379C143.563 103.434 143.497 103.505 143.441 103.592C143.386 103.675 143.348 103.77 143.327 103.878H144.973ZM147.134 105.503C146.95 105.503 146.781 105.468 146.625 105.399C146.473 105.326 146.339 105.229 146.225 105.108C146.111 104.984 146.021 104.84 145.955 104.677C145.893 104.515 145.862 104.34 145.862 104.153C145.862 103.966 145.893 103.791 145.955 103.628C146.021 103.466 146.111 103.324 146.225 103.203C146.339 103.078 146.473 102.981 146.625 102.912C146.781 102.839 146.95 102.803 147.134 102.803C147.331 102.803 147.511 102.848 147.674 102.938C147.837 103.024 147.961 103.13 148.048 103.254V102.855H148.494V105.451H148.048V105.051C147.961 105.176 147.837 105.283 147.674 105.373C147.511 105.46 147.331 105.503 147.134 105.503ZM147.201 105.093C147.333 105.093 147.452 105.068 147.56 105.02C147.667 104.972 147.759 104.906 147.835 104.823C147.915 104.736 147.975 104.636 148.017 104.521C148.062 104.407 148.084 104.284 148.084 104.153C148.084 104.021 148.062 103.898 148.017 103.784C147.975 103.67 147.915 103.571 147.835 103.488C147.759 103.402 147.667 103.334 147.56 103.286C147.452 103.237 147.333 103.213 147.201 103.213C147.07 103.213 146.949 103.237 146.838 103.286C146.731 103.334 146.637 103.402 146.557 103.488C146.481 103.571 146.421 103.67 146.376 103.784C146.334 103.898 146.313 104.021 146.313 104.153C146.313 104.284 146.334 104.407 146.376 104.521C146.421 104.636 146.481 104.736 146.557 104.823C146.637 104.906 146.731 104.972 146.838 105.02C146.949 105.068 147.07 105.093 147.201 105.093ZM149.335 102.855H149.782V103.358C149.806 103.275 149.844 103.201 149.896 103.135C149.948 103.069 150.007 103.014 150.072 102.969C150.138 102.924 150.207 102.889 150.28 102.865C150.356 102.841 150.432 102.829 150.509 102.829C150.578 102.829 150.645 102.836 150.711 102.849V103.312C150.67 103.294 150.63 103.284 150.592 103.28C150.554 103.273 150.512 103.27 150.467 103.27C150.384 103.27 150.301 103.289 150.218 103.327C150.138 103.362 150.065 103.415 150 103.488C149.937 103.561 149.885 103.654 149.844 103.769C149.802 103.879 149.782 104.011 149.782 104.163V105.451H149.335V102.855ZM151.237 102.855H151.683V103.254C151.773 103.099 151.891 102.984 152.036 102.912C152.182 102.839 152.339 102.803 152.509 102.803C152.654 102.803 152.788 102.827 152.909 102.875C153.03 102.924 153.132 102.995 153.215 103.088C153.302 103.178 153.369 103.289 153.418 103.421C153.466 103.549 153.49 103.692 153.49 103.852V105.451H153.049V103.919C153.049 103.701 152.992 103.53 152.878 103.405C152.767 103.277 152.62 103.213 152.436 103.213C152.332 103.213 152.234 103.234 152.14 103.275C152.05 103.317 151.971 103.379 151.901 103.462C151.836 103.542 151.782 103.64 151.74 103.758C151.702 103.876 151.683 104.011 151.683 104.163V105.451H151.237V102.855ZM158.891 103.924C158.891 103.713 158.848 103.542 158.762 103.41C158.675 103.279 158.547 103.213 158.377 103.213C158.17 103.213 158 103.294 157.868 103.457C157.74 103.62 157.673 103.841 157.666 104.122V105.451H157.219V103.924C157.219 103.713 157.176 103.542 157.089 103.41C157.006 103.279 156.88 103.213 156.71 103.213C156.499 103.213 156.326 103.298 156.191 103.467C156.06 103.637 155.994 103.869 155.994 104.163V105.451H155.547V102.855H155.994V103.254C156.07 103.116 156.175 103.007 156.311 102.927C156.446 102.844 156.601 102.803 156.778 102.803C156.972 102.803 157.136 102.853 157.271 102.953C157.41 103.05 157.512 103.185 157.578 103.358C157.647 103.189 157.756 103.054 157.905 102.953C158.057 102.853 158.232 102.803 158.429 102.803C158.571 102.803 158.697 102.829 158.808 102.881C158.923 102.929 159.018 103 159.094 103.093C159.173 103.183 159.234 103.294 159.276 103.426C159.317 103.554 159.338 103.698 159.338 103.857V105.451H158.891V103.924ZM161.294 105.503C161.097 105.503 160.915 105.468 160.749 105.399C160.583 105.326 160.439 105.229 160.318 105.108C160.197 104.987 160.102 104.845 160.033 104.682C159.967 104.516 159.934 104.34 159.934 104.153C159.934 103.966 159.967 103.791 160.033 103.628C160.102 103.462 160.197 103.318 160.318 103.197C160.439 103.076 160.583 102.981 160.749 102.912C160.915 102.839 161.097 102.803 161.294 102.803C161.488 102.803 161.668 102.839 161.834 102.912C162.001 102.981 162.144 103.076 162.265 103.197C162.387 103.318 162.48 103.462 162.546 103.628C162.615 103.791 162.65 103.966 162.65 104.153C162.65 104.34 162.615 104.516 162.546 104.682C162.48 104.845 162.387 104.987 162.265 105.108C162.144 105.229 162.001 105.326 161.834 105.399C161.668 105.468 161.488 105.503 161.294 105.503ZM161.294 105.088C161.429 105.088 161.552 105.063 161.663 105.015C161.774 104.966 161.867 104.901 161.944 104.817C162.023 104.731 162.084 104.632 162.125 104.521C162.17 104.407 162.193 104.284 162.193 104.153C162.193 104.025 162.17 103.904 162.125 103.789C162.084 103.675 162.023 103.576 161.944 103.493C161.867 103.407 161.774 103.339 161.663 103.291C161.552 103.242 161.429 103.218 161.294 103.218C161.159 103.218 161.037 103.242 160.926 103.291C160.815 103.339 160.72 103.407 160.64 103.493C160.561 103.576 160.498 103.675 160.453 103.789C160.412 103.904 160.391 104.025 160.391 104.153C160.391 104.284 160.412 104.407 160.453 104.521C160.498 104.632 160.561 104.731 160.64 104.817C160.72 104.901 160.815 104.966 160.926 105.015C161.037 105.063 161.159 105.088 161.294 105.088ZM163.291 102.855H163.737V103.358C163.762 103.275 163.8 103.201 163.852 103.135C163.904 103.069 163.962 103.014 164.028 102.969C164.094 102.924 164.163 102.889 164.236 102.865C164.312 102.841 164.388 102.829 164.464 102.829C164.534 102.829 164.601 102.836 164.667 102.849V103.312C164.625 103.294 164.586 103.284 164.547 103.28C164.509 103.273 164.468 103.27 164.423 103.27C164.34 103.27 164.257 103.289 164.174 103.327C164.094 103.362 164.021 103.415 163.955 103.488C163.893 103.561 163.841 103.654 163.8 103.769C163.758 103.879 163.737 104.011 163.737 104.163V105.451H163.291V102.855ZM166.244 105.503C166.043 105.503 165.859 105.468 165.693 105.399C165.527 105.33 165.385 105.235 165.267 105.113C165.15 104.992 165.058 104.85 164.992 104.688C164.93 104.521 164.899 104.343 164.899 104.153C164.899 103.962 164.932 103.786 164.997 103.623C165.063 103.457 165.155 103.313 165.273 103.192C165.394 103.071 165.537 102.976 165.704 102.907C165.87 102.837 166.051 102.803 166.249 102.803C166.418 102.803 166.578 102.832 166.727 102.891C166.875 102.946 167.005 103.031 167.116 103.145C167.23 103.256 167.32 103.393 167.386 103.556C167.452 103.715 167.485 103.898 167.485 104.106C167.485 104.13 167.485 104.153 167.485 104.174C167.485 104.191 167.483 104.213 167.48 104.241H165.35C165.354 104.362 165.378 104.475 165.423 104.579C165.472 104.682 165.534 104.772 165.61 104.849C165.69 104.925 165.783 104.985 165.89 105.03C166.001 105.072 166.121 105.093 166.249 105.093C166.45 105.093 166.614 105.053 166.742 104.973C166.874 104.89 166.979 104.779 167.059 104.641L167.412 104.885C167.294 105.075 167.137 105.226 166.939 105.337C166.746 105.448 166.514 105.503 166.244 105.503ZM167.028 103.878C167.01 103.77 166.978 103.675 166.929 103.592C166.884 103.509 166.825 103.438 166.753 103.379C166.683 103.32 166.604 103.275 166.514 103.244C166.424 103.213 166.33 103.197 166.233 103.197C166.136 103.197 166.041 103.213 165.948 103.244C165.854 103.275 165.769 103.32 165.693 103.379C165.617 103.434 165.551 103.505 165.496 103.592C165.44 103.675 165.402 103.77 165.382 103.878H167.028Z" fill="#037DD6"/>
-<path d="M81.8633 113.65H80.8796V113.258H83.252V113.65H82.2683V116.418H81.8633V113.65ZM83.7522 116.418V113.08H84.135V114.536C84.2122 114.402 84.313 114.304 84.4377 114.242C84.5623 114.179 84.6973 114.148 84.8427 114.148C84.9673 114.148 85.0816 114.169 85.1854 114.211C85.2893 114.252 85.3768 114.313 85.4481 114.393C85.5222 114.47 85.5801 114.565 85.6216 114.678C85.6632 114.788 85.684 114.911 85.684 115.047V116.418H85.3056V115.105C85.3056 114.918 85.2567 114.771 85.1587 114.665C85.0638 114.555 84.9377 114.5 84.7804 114.5C84.6914 114.5 84.6068 114.518 84.5267 114.553C84.4495 114.589 84.3813 114.642 84.3219 114.714C84.2656 114.782 84.2196 114.866 84.184 114.967C84.1513 115.068 84.135 115.184 84.135 115.314V116.418H83.7522ZM86.6618 113.596C86.5847 113.596 86.5194 113.571 86.466 113.521C86.4126 113.467 86.3859 113.402 86.3859 113.325C86.3859 113.251 86.4126 113.187 86.466 113.133C86.5194 113.08 86.5847 113.053 86.6618 113.053C86.739 113.053 86.8028 113.08 86.8532 113.133C86.9037 113.187 86.9289 113.251 86.9289 113.325C86.9289 113.402 86.9037 113.467 86.8532 113.521C86.8028 113.571 86.739 113.596 86.6618 113.596ZM86.466 114.193H86.8488V116.418H86.466V114.193ZM88.3392 116.463C88.1404 116.463 87.9624 116.421 87.8051 116.338C87.6478 116.252 87.5351 116.122 87.4668 115.947L87.7784 115.773C87.82 115.886 87.8927 115.973 87.9965 116.036C88.1033 116.095 88.2191 116.125 88.3437 116.125C88.4505 116.125 88.541 116.099 88.6152 116.049C88.6923 115.995 88.7309 115.921 88.7309 115.826C88.7309 115.746 88.7027 115.679 88.6464 115.626C88.59 115.573 88.4891 115.524 88.3437 115.479L88.1211 115.408C87.9372 115.355 87.7977 115.273 87.7027 115.163C87.6108 115.05 87.5648 114.915 87.5648 114.758C87.5648 114.663 87.584 114.579 87.6226 114.504C87.6642 114.427 87.7191 114.363 87.7873 114.313C87.8585 114.26 87.9401 114.22 88.0321 114.193C88.1241 114.163 88.2235 114.148 88.3303 114.148C88.4965 114.148 88.6419 114.182 88.7665 114.251C88.8912 114.316 88.9906 114.411 89.0648 114.536L88.7799 114.731C88.7294 114.66 88.6656 114.601 88.5885 114.553C88.5143 114.503 88.4238 114.478 88.317 114.478C88.222 114.478 88.136 114.501 88.0588 114.549C87.9846 114.596 87.9475 114.662 87.9475 114.745C87.9475 114.813 87.9683 114.874 88.0099 114.927C88.0544 114.981 88.1389 115.027 88.2636 115.065L88.5084 115.141C88.7013 115.2 88.8496 115.282 88.9535 115.386C89.0603 115.49 89.1137 115.626 89.1137 115.795C89.1137 115.902 89.0944 115.997 89.0558 116.08C89.0173 116.163 88.9624 116.233 88.8912 116.289C88.8229 116.346 88.7413 116.389 88.6464 116.418C88.5514 116.448 88.449 116.463 88.3392 116.463ZM91.9226 116.463C91.7535 116.463 91.5977 116.433 91.4553 116.374C91.3128 116.314 91.1897 116.233 91.0858 116.129C90.982 116.022 90.9004 115.899 90.841 115.76C90.7846 115.617 90.7565 115.466 90.7565 115.306C90.7565 115.145 90.7846 114.996 90.841 114.856C90.9004 114.714 90.982 114.59 91.0858 114.487C91.1897 114.38 91.3128 114.297 91.4553 114.237C91.5977 114.178 91.7535 114.148 91.9226 114.148C92.1541 114.148 92.3588 114.203 92.5369 114.313C92.7149 114.423 92.8529 114.567 92.9508 114.745L92.617 114.932C92.5547 114.804 92.4627 114.702 92.341 114.625C92.2223 114.544 92.0829 114.504 91.9226 114.504C91.8069 114.504 91.7016 114.525 91.6066 114.567C91.5116 114.608 91.4286 114.666 91.3573 114.74C91.2891 114.812 91.2357 114.896 91.1971 114.994C91.1615 115.092 91.1437 115.196 91.1437 115.306C91.1437 115.418 91.1615 115.524 91.1971 115.622C91.2357 115.717 91.2891 115.801 91.3573 115.875C91.4286 115.947 91.5116 116.003 91.6066 116.044C91.7016 116.086 91.8069 116.107 91.9226 116.107C92.0829 116.107 92.2223 116.068 92.341 115.991C92.4627 115.911 92.5547 115.807 92.617 115.679L92.9508 115.866C92.8529 116.044 92.7149 116.188 92.5369 116.298C92.3588 116.408 92.1541 116.463 91.9226 116.463ZM94.5276 116.463C94.3585 116.463 94.2027 116.433 94.0603 116.374C93.9178 116.312 93.7947 116.228 93.6908 116.125C93.587 116.021 93.5054 115.899 93.446 115.76C93.3897 115.617 93.3615 115.466 93.3615 115.306C93.3615 115.145 93.3897 114.996 93.446 114.856C93.5054 114.714 93.587 114.59 93.6908 114.487C93.7947 114.383 93.9178 114.301 94.0603 114.242C94.2027 114.179 94.3585 114.148 94.5276 114.148C94.6938 114.148 94.8481 114.179 94.9905 114.242C95.133 114.301 95.2561 114.383 95.36 114.487C95.4638 114.59 95.5439 114.714 95.6003 114.856C95.6597 114.996 95.6893 115.145 95.6893 115.306C95.6893 115.466 95.6597 115.617 95.6003 115.76C95.5439 115.899 95.4638 116.021 95.36 116.125C95.2561 116.228 95.133 116.312 94.9905 116.374C94.8481 116.433 94.6938 116.463 94.5276 116.463ZM94.5276 116.107C94.6434 116.107 94.7487 116.086 94.8437 116.044C94.9386 116.003 95.0187 115.947 95.084 115.875C95.1523 115.801 95.2042 115.717 95.2398 115.622C95.2784 115.524 95.2977 115.418 95.2977 115.306C95.2977 115.196 95.2784 115.092 95.2398 114.994C95.2042 114.896 95.1523 114.812 95.084 114.74C95.0187 114.666 94.9386 114.608 94.8437 114.567C94.7487 114.525 94.6434 114.504 94.5276 114.504C94.4119 114.504 94.3066 114.525 94.2116 114.567C94.1167 114.608 94.0351 114.666 93.9668 114.74C93.8986 114.812 93.8451 114.896 93.8066 114.994C93.771 115.092 93.7532 115.196 93.7532 115.306C93.7532 115.418 93.771 115.524 93.8066 115.622C93.8451 115.717 93.8986 115.801 93.9668 115.875C94.0351 115.947 94.1167 116.003 94.2116 116.044C94.3066 116.086 94.4119 116.107 94.5276 116.107ZM96.3315 114.193H96.7143V114.536C96.7915 114.402 96.8924 114.304 97.017 114.242C97.1416 114.179 97.2766 114.148 97.422 114.148C97.5467 114.148 97.6609 114.169 97.7648 114.211C97.8686 114.252 97.9562 114.313 98.0274 114.393C98.1016 114.47 98.1594 114.565 98.201 114.678C98.2425 114.788 98.2633 114.911 98.2633 115.047V116.418H97.8849V115.105C97.8849 114.918 97.836 114.771 97.7381 114.665C97.6431 114.555 97.517 114.5 97.3597 114.5C97.2707 114.5 97.1861 114.518 97.106 114.553C97.0289 114.589 96.9606 114.642 96.9013 114.714C96.8449 114.782 96.7989 114.866 96.7633 114.967C96.7306 115.068 96.7143 115.184 96.7143 115.314V116.418H96.3315V114.193ZM99.8827 116.441C99.7848 116.441 99.6943 116.427 99.6112 116.401C99.5281 116.371 99.4554 116.329 99.3931 116.276C99.3338 116.22 99.2863 116.148 99.2507 116.062C99.218 115.976 99.2017 115.875 99.2017 115.76V114.544H98.7299V114.193H99.2017V113.574H99.5845V114.193H100.225V114.544H99.5845V115.711C99.5845 115.853 99.6157 115.952 99.678 116.009C99.7403 116.062 99.8323 116.089 99.9539 116.089C100.001 116.089 100.049 116.086 100.096 116.08C100.147 116.071 100.19 116.059 100.225 116.044V116.387C100.178 116.402 100.126 116.414 100.07 116.423C100.013 116.435 99.951 116.441 99.8827 116.441ZM101.756 116.463C101.584 116.463 101.427 116.433 101.284 116.374C101.142 116.314 101.02 116.233 100.919 116.129C100.818 116.025 100.74 115.904 100.683 115.764C100.63 115.622 100.603 115.469 100.603 115.306C100.603 115.142 100.631 114.991 100.688 114.852C100.744 114.709 100.823 114.586 100.924 114.482C101.027 114.378 101.151 114.297 101.293 114.237C101.435 114.178 101.591 114.148 101.76 114.148C101.906 114.148 102.042 114.174 102.17 114.224C102.298 114.271 102.409 114.344 102.504 114.442C102.602 114.537 102.679 114.654 102.735 114.794C102.792 114.93 102.82 115.087 102.82 115.266C102.82 115.286 102.82 115.306 102.82 115.323C102.82 115.338 102.818 115.358 102.815 115.381H100.99C100.993 115.485 101.014 115.582 101.053 115.671C101.094 115.76 101.148 115.837 101.213 115.902C101.281 115.967 101.361 116.019 101.453 116.058C101.548 116.093 101.651 116.111 101.76 116.111C101.933 116.111 102.073 116.077 102.183 116.009C102.296 115.938 102.387 115.843 102.455 115.724L102.757 115.933C102.657 116.096 102.522 116.225 102.352 116.32C102.186 116.415 101.987 116.463 101.756 116.463ZM102.428 115.07C102.413 114.978 102.385 114.896 102.344 114.825C102.305 114.754 102.254 114.693 102.192 114.642C102.133 114.592 102.065 114.553 101.987 114.527C101.91 114.5 101.83 114.487 101.747 114.487C101.664 114.487 101.582 114.5 101.502 114.527C101.422 114.553 101.349 114.592 101.284 114.642C101.219 114.69 101.162 114.751 101.115 114.825C101.068 114.896 101.035 114.978 101.017 115.07H102.428ZM103.456 114.193H103.839V114.536C103.916 114.402 104.017 114.304 104.141 114.242C104.266 114.179 104.401 114.148 104.546 114.148C104.671 114.148 104.785 114.169 104.889 114.211C104.993 114.252 105.08 114.313 105.152 114.393C105.226 114.47 105.284 114.565 105.325 114.678C105.367 114.788 105.387 114.911 105.387 115.047V116.418H105.009V115.105C105.009 114.918 104.96 114.771 104.862 114.665C104.767 114.555 104.641 114.5 104.484 114.5C104.395 114.5 104.31 114.518 104.23 114.553C104.153 114.589 104.085 114.642 104.025 114.714C103.969 114.782 103.923 114.866 103.888 114.967C103.855 115.068 103.839 115.184 103.839 115.314V116.418H103.456V114.193ZM107.007 116.441C106.909 116.441 106.819 116.427 106.735 116.401C106.652 116.371 106.58 116.329 106.517 116.276C106.458 116.22 106.411 116.148 106.375 116.062C106.342 115.976 106.326 115.875 106.326 115.76V114.544H105.854V114.193H106.326V113.574H106.709V114.193H107.35V114.544H106.709V115.711C106.709 115.853 106.74 115.952 106.802 116.009C106.865 116.062 106.957 116.089 107.078 116.089C107.126 116.089 107.173 116.086 107.221 116.08C107.271 116.071 107.314 116.059 107.35 116.044V116.387C107.302 116.402 107.25 116.414 107.194 116.423C107.138 116.435 107.075 116.441 107.007 116.441ZM109.294 113.596C109.216 113.596 109.151 113.571 109.098 113.521C109.044 113.467 109.018 113.402 109.018 113.325C109.018 113.251 109.044 113.187 109.098 113.133C109.151 113.08 109.216 113.053 109.294 113.053C109.371 113.053 109.435 113.08 109.485 113.133C109.535 113.187 109.561 113.251 109.561 113.325C109.561 113.402 109.535 113.467 109.485 113.521C109.435 113.571 109.371 113.596 109.294 113.596ZM109.098 114.193H109.481V116.418H109.098V114.193ZM110.971 116.463C110.772 116.463 110.594 116.421 110.437 116.338C110.28 116.252 110.167 116.122 110.099 115.947L110.41 115.773C110.452 115.886 110.524 115.973 110.628 116.036C110.735 116.095 110.851 116.125 110.975 116.125C111.082 116.125 111.173 116.099 111.247 116.049C111.324 115.995 111.363 115.921 111.363 115.826C111.363 115.746 111.334 115.679 111.278 115.626C111.222 115.573 111.121 115.524 110.975 115.479L110.753 115.408C110.569 115.355 110.429 115.273 110.335 115.163C110.243 115.05 110.197 114.915 110.197 114.758C110.197 114.663 110.216 114.579 110.254 114.504C110.296 114.427 110.351 114.363 110.419 114.313C110.49 114.26 110.572 114.22 110.664 114.193C110.756 114.163 110.855 114.148 110.962 114.148C111.128 114.148 111.274 114.182 111.398 114.251C111.523 114.316 111.622 114.411 111.697 114.536L111.412 114.731C111.361 114.66 111.297 114.601 111.22 114.553C111.146 114.503 111.056 114.478 110.949 114.478C110.854 114.478 110.768 114.501 110.691 114.549C110.616 114.596 110.579 114.662 110.579 114.745C110.579 114.813 110.6 114.874 110.642 114.927C110.686 114.981 110.771 115.027 110.895 115.065L111.14 115.141C111.333 115.2 111.481 115.282 111.585 115.386C111.692 115.49 111.745 115.626 111.745 115.795C111.745 115.902 111.726 115.997 111.688 116.08C111.649 116.163 111.594 116.233 111.523 116.289C111.455 116.346 111.373 116.389 111.278 116.418C111.183 116.448 111.081 116.463 110.971 116.463ZM114.234 116.463C114.035 116.463 113.857 116.421 113.7 116.338C113.543 116.252 113.43 116.122 113.362 115.947L113.673 115.773C113.715 115.886 113.787 115.973 113.891 116.036C113.998 116.095 114.114 116.125 114.238 116.125C114.345 116.125 114.436 116.099 114.51 116.049C114.587 115.995 114.626 115.921 114.626 115.826C114.626 115.746 114.597 115.679 114.541 115.626C114.485 115.573 114.384 115.524 114.238 115.479L114.016 115.408C113.832 115.355 113.692 115.273 113.597 115.163C113.505 115.05 113.459 114.915 113.459 114.758C113.459 114.663 113.479 114.579 113.517 114.504C113.559 114.427 113.614 114.363 113.682 114.313C113.753 114.26 113.835 114.22 113.927 114.193C114.019 114.163 114.118 114.148 114.225 114.148C114.391 114.148 114.537 114.182 114.661 114.251C114.786 114.316 114.885 114.411 114.959 114.536L114.675 114.731C114.624 114.66 114.56 114.601 114.483 114.553C114.409 114.503 114.318 114.478 114.212 114.478C114.117 114.478 114.031 114.501 113.953 114.549C113.879 114.596 113.842 114.662 113.842 114.745C113.842 114.813 113.863 114.874 113.905 114.927C113.949 114.981 114.034 115.027 114.158 115.065L114.403 115.141C114.596 115.2 114.744 115.282 114.848 115.386C114.955 115.49 115.008 115.626 115.008 115.795C115.008 115.902 114.989 115.997 114.951 116.08C114.912 116.163 114.857 116.233 114.786 116.289C114.718 116.346 114.636 116.389 114.541 116.418C114.446 116.448 114.344 116.463 114.234 116.463ZM116.446 116.463C116.325 116.463 116.213 116.442 116.112 116.401C116.011 116.356 115.925 116.295 115.854 116.218C115.783 116.141 115.727 116.047 115.685 115.938C115.646 115.825 115.627 115.699 115.627 115.559V114.193H116.01V115.501C116.01 115.688 116.055 115.837 116.144 115.947C116.236 116.056 116.359 116.111 116.513 116.111C116.599 116.111 116.679 116.093 116.753 116.058C116.83 116.019 116.896 115.966 116.949 115.898C117.006 115.826 117.05 115.74 117.083 115.639C117.115 115.539 117.132 115.424 117.132 115.297V114.193H117.514V116.418H117.132V116.076C117.057 116.206 116.96 116.304 116.838 116.369C116.719 116.432 116.589 116.463 116.446 116.463ZM118.329 117.349V114.193H118.711V114.536C118.786 114.429 118.892 114.338 119.032 114.264C119.171 114.187 119.326 114.148 119.495 114.148C119.649 114.148 119.793 114.179 119.927 114.242C120.06 114.301 120.176 114.384 120.274 114.491C120.372 114.595 120.447 114.717 120.501 114.856C120.557 114.996 120.585 115.145 120.585 115.306C120.585 115.466 120.557 115.616 120.501 115.755C120.447 115.895 120.372 116.018 120.274 116.125C120.176 116.228 120.06 116.312 119.927 116.374C119.793 116.433 119.649 116.463 119.495 116.463C119.326 116.463 119.171 116.426 119.032 116.352C118.892 116.274 118.786 116.182 118.711 116.076V117.349H118.329ZM119.437 116.111C119.55 116.111 119.652 116.09 119.744 116.049C119.836 116.007 119.915 115.951 119.98 115.88C120.048 115.806 120.1 115.72 120.136 115.622C120.174 115.524 120.194 115.418 120.194 115.306C120.194 115.193 120.174 115.087 120.136 114.99C120.1 114.892 120.048 114.807 119.98 114.736C119.915 114.662 119.836 114.604 119.744 114.562C119.652 114.521 119.55 114.5 119.437 114.5C119.324 114.5 119.222 114.521 119.13 114.562C119.038 114.604 118.958 114.662 118.89 114.736C118.824 114.807 118.772 114.892 118.734 114.99C118.698 115.087 118.68 115.193 118.68 115.306C118.68 115.418 118.698 115.524 118.734 115.622C118.772 115.72 118.824 115.806 118.89 115.88C118.958 115.951 119.038 116.007 119.13 116.049C119.222 116.09 119.324 116.111 119.437 116.111ZM121.229 117.349V114.193H121.612V114.536C121.686 114.429 121.793 114.338 121.933 114.264C122.072 114.187 122.226 114.148 122.396 114.148C122.55 114.148 122.694 114.179 122.827 114.242C122.961 114.301 123.077 114.384 123.174 114.491C123.272 114.595 123.348 114.717 123.401 114.856C123.458 114.996 123.486 115.145 123.486 115.306C123.486 115.466 123.458 115.616 123.401 115.755C123.348 115.895 123.272 116.018 123.174 116.125C123.077 116.228 122.961 116.312 122.827 116.374C122.694 116.433 122.55 116.463 122.396 116.463C122.226 116.463 122.072 116.426 121.933 116.352C121.793 116.274 121.686 116.182 121.612 116.076V117.349H121.229ZM122.338 116.111C122.45 116.111 122.553 116.09 122.645 116.049C122.737 116.007 122.815 115.951 122.881 115.88C122.949 115.806 123.001 115.72 123.036 115.622C123.075 115.524 123.094 115.418 123.094 115.306C123.094 115.193 123.075 115.087 123.036 114.99C123.001 114.892 122.949 114.807 122.881 114.736C122.815 114.662 122.737 114.604 122.645 114.562C122.553 114.521 122.45 114.5 122.338 114.5C122.225 114.5 122.123 114.521 122.031 114.562C121.939 114.604 121.858 114.662 121.79 114.736C121.725 114.807 121.673 114.892 121.634 114.99C121.599 115.087 121.581 115.193 121.581 115.306C121.581 115.418 121.599 115.524 121.634 115.622C121.673 115.72 121.725 115.806 121.79 115.88C121.858 115.951 121.939 116.007 122.031 116.049C122.123 116.09 122.225 116.111 122.338 116.111ZM124.13 113.08H124.513V116.418H124.13V113.08ZM125.527 113.596C125.45 113.596 125.385 113.571 125.331 113.521C125.278 113.467 125.251 113.402 125.251 113.325C125.251 113.251 125.278 113.187 125.331 113.133C125.385 113.08 125.45 113.053 125.527 113.053C125.604 113.053 125.668 113.08 125.718 113.133C125.769 113.187 125.794 113.251 125.794 113.325C125.794 113.402 125.769 113.467 125.718 113.521C125.668 113.571 125.604 113.596 125.527 113.596ZM125.331 114.193H125.714V116.418H125.331V114.193ZM127.512 116.463C127.339 116.463 127.182 116.433 127.04 116.374C126.897 116.314 126.776 116.233 126.675 116.129C126.574 116.025 126.495 115.904 126.439 115.764C126.385 115.622 126.359 115.469 126.359 115.306C126.359 115.142 126.387 114.991 126.443 114.852C126.5 114.709 126.578 114.586 126.679 114.482C126.783 114.378 126.906 114.297 127.049 114.237C127.191 114.178 127.347 114.148 127.516 114.148C127.661 114.148 127.798 114.174 127.925 114.224C128.053 114.271 128.164 114.344 128.259 114.442C128.357 114.537 128.434 114.654 128.491 114.794C128.547 114.93 128.575 115.087 128.575 115.266C128.575 115.286 128.575 115.306 128.575 115.323C128.575 115.338 128.574 115.358 128.571 115.381H126.746C126.749 115.485 126.77 115.582 126.808 115.671C126.85 115.76 126.903 115.837 126.969 115.902C127.037 115.967 127.117 116.019 127.209 116.058C127.304 116.093 127.406 116.111 127.516 116.111C127.688 116.111 127.829 116.077 127.939 116.009C128.052 115.938 128.142 115.843 128.21 115.724L128.513 115.933C128.412 116.096 128.277 116.225 128.108 116.32C127.942 116.415 127.743 116.463 127.512 116.463ZM128.184 115.07C128.169 114.978 128.141 114.896 128.099 114.825C128.061 114.754 128.01 114.693 127.948 114.642C127.888 114.592 127.82 114.553 127.743 114.527C127.666 114.5 127.586 114.487 127.503 114.487C127.42 114.487 127.338 114.5 127.258 114.527C127.178 114.553 127.105 114.592 127.04 114.642C126.974 114.69 126.918 114.751 126.871 114.825C126.823 114.896 126.79 114.978 126.773 115.07H128.184ZM130.128 116.463C129.971 116.463 129.826 116.433 129.692 116.374C129.561 116.312 129.447 116.228 129.349 116.125C129.251 116.018 129.174 115.895 129.118 115.755C129.064 115.616 129.038 115.466 129.038 115.306C129.038 115.145 129.064 114.996 129.118 114.856C129.174 114.717 129.251 114.595 129.349 114.491C129.447 114.384 129.561 114.301 129.692 114.242C129.826 114.179 129.971 114.148 130.128 114.148C130.297 114.148 130.452 114.187 130.591 114.264C130.731 114.338 130.837 114.429 130.912 114.536V113.08H131.294V116.418H130.912V116.076C130.837 116.182 130.731 116.274 130.591 116.352C130.452 116.426 130.297 116.463 130.128 116.463ZM130.186 116.111C130.299 116.111 130.401 116.09 130.493 116.049C130.585 116.007 130.664 115.951 130.729 115.88C130.797 115.806 130.849 115.72 130.885 115.622C130.923 115.524 130.943 115.418 130.943 115.306C130.943 115.193 130.923 115.087 130.885 114.99C130.849 114.892 130.797 114.807 130.729 114.736C130.664 114.662 130.585 114.604 130.493 114.562C130.401 114.521 130.299 114.5 130.186 114.5C130.073 114.5 129.969 114.521 129.875 114.562C129.783 114.604 129.702 114.662 129.634 114.736C129.569 114.807 129.517 114.892 129.478 114.99C129.443 115.087 129.425 115.193 129.425 115.306C129.425 115.418 129.443 115.524 129.478 115.622C129.517 115.72 129.569 115.806 129.634 115.88C129.702 115.951 129.783 116.007 129.875 116.049C129.969 116.09 130.073 116.111 130.186 116.111ZM134.44 116.463C134.271 116.463 134.117 116.426 133.977 116.352C133.838 116.274 133.731 116.182 133.657 116.076V116.418H133.274V113.08H133.657V114.536C133.731 114.429 133.838 114.338 133.977 114.264C134.117 114.187 134.271 114.148 134.44 114.148C134.595 114.148 134.738 114.179 134.872 114.242C135.005 114.301 135.121 114.384 135.219 114.491C135.317 114.595 135.393 114.717 135.446 114.856C135.503 114.996 135.531 115.145 135.531 115.306C135.531 115.466 135.503 115.616 135.446 115.755C135.393 115.895 135.317 116.018 135.219 116.125C135.121 116.228 135.005 116.312 134.872 116.374C134.738 116.433 134.595 116.463 134.44 116.463ZM134.382 116.111C134.495 116.111 134.597 116.09 134.689 116.049C134.781 116.007 134.86 115.951 134.925 115.88C134.994 115.806 135.046 115.72 135.081 115.622C135.12 115.524 135.139 115.418 135.139 115.306C135.139 115.193 135.12 115.087 135.081 114.99C135.046 114.892 134.994 114.807 134.925 114.736C134.86 114.662 134.781 114.604 134.689 114.562C134.597 114.521 134.495 114.5 134.382 114.5C134.27 114.5 134.167 114.521 134.075 114.562C133.983 114.604 133.903 114.662 133.835 114.736C133.77 114.807 133.718 114.892 133.679 114.99C133.643 115.087 133.626 115.193 133.626 115.306C133.626 115.418 133.643 115.524 133.679 115.622C133.718 115.72 133.77 115.806 133.835 115.88C133.903 115.951 133.983 116.007 134.075 116.049C134.167 116.09 134.27 116.111 134.382 116.111ZM136.292 117.349L136.777 116.303L135.802 114.193H136.225L136.99 115.884L137.752 114.193H138.179L136.719 117.349H136.292Z" fill="#535A61"/>
-<path d="M141.193 116.08C141.366 116.08 141.526 116.049 141.674 115.987C141.826 115.921 141.955 115.832 142.061 115.72C142.171 115.607 142.257 115.476 142.32 115.328C142.382 115.177 142.413 115.013 142.413 114.838C142.413 114.666 142.382 114.504 142.32 114.353C142.257 114.202 142.171 114.07 142.061 113.957C141.955 113.844 141.826 113.757 141.674 113.694C141.526 113.629 141.366 113.596 141.193 113.596C141.021 113.596 140.861 113.629 140.713 113.694C140.564 113.757 140.435 113.844 140.326 113.957C140.219 114.07 140.134 114.202 140.072 114.353C140.009 114.504 139.978 114.666 139.978 114.838C139.978 115.013 140.009 115.177 140.072 115.328C140.134 115.476 140.219 115.607 140.326 115.72C140.435 115.832 140.564 115.921 140.713 115.987C140.861 116.049 141.021 116.08 141.193 116.08ZM141.193 116.472C140.965 116.472 140.751 116.43 140.553 116.347C140.357 116.261 140.185 116.145 140.036 116C139.888 115.852 139.771 115.678 139.685 115.479C139.601 115.28 139.56 115.067 139.56 114.838C139.56 114.61 139.601 114.396 139.685 114.197C139.771 113.998 139.888 113.826 140.036 113.681C140.185 113.533 140.357 113.417 140.553 113.334C140.751 113.248 140.965 113.205 141.193 113.205C141.422 113.205 141.636 113.248 141.834 113.334C142.033 113.417 142.205 113.533 142.351 113.681C142.499 113.826 142.615 113.998 142.698 114.197C142.784 114.396 142.827 114.61 142.827 114.838C142.827 115.067 142.784 115.28 142.698 115.479C142.615 115.678 142.499 115.852 142.351 116C142.205 116.145 142.033 116.261 141.834 116.347C141.636 116.43 141.422 116.472 141.193 116.472ZM143.482 117.349V114.193H143.864V114.536C143.938 114.429 144.045 114.338 144.185 114.264C144.324 114.187 144.479 114.148 144.648 114.148C144.802 114.148 144.946 114.179 145.079 114.242C145.213 114.301 145.329 114.384 145.427 114.491C145.525 114.595 145.6 114.717 145.654 114.856C145.71 114.996 145.738 115.145 145.738 115.306C145.738 115.466 145.71 115.616 145.654 115.755C145.6 115.895 145.525 116.018 145.427 116.125C145.329 116.228 145.213 116.312 145.079 116.374C144.946 116.433 144.802 116.463 144.648 116.463C144.479 116.463 144.324 116.426 144.185 116.352C144.045 116.274 143.938 116.182 143.864 116.076V117.349H143.482ZM144.59 116.111C144.703 116.111 144.805 116.09 144.897 116.049C144.989 116.007 145.068 115.951 145.133 115.88C145.201 115.806 145.253 115.72 145.289 115.622C145.327 115.524 145.346 115.418 145.346 115.306C145.346 115.193 145.327 115.087 145.289 114.99C145.253 114.892 145.201 114.807 145.133 114.736C145.068 114.662 144.989 114.604 144.897 114.562C144.805 114.521 144.703 114.5 144.59 114.5C144.477 114.5 144.375 114.521 144.283 114.562C144.191 114.604 144.111 114.662 144.042 114.736C143.977 114.807 143.925 114.892 143.887 114.99C143.851 115.087 143.833 115.193 143.833 115.306C143.833 115.418 143.851 115.524 143.887 115.622C143.925 115.72 143.977 115.806 144.042 115.88C144.111 115.951 144.191 116.007 144.283 116.049C144.375 116.09 144.477 116.111 144.59 116.111ZM147.361 116.463C147.189 116.463 147.032 116.433 146.89 116.374C146.747 116.314 146.626 116.233 146.525 116.129C146.424 116.025 146.345 115.904 146.289 115.764C146.235 115.622 146.209 115.469 146.209 115.306C146.209 115.142 146.237 114.991 146.293 114.852C146.35 114.709 146.428 114.586 146.529 114.482C146.633 114.378 146.756 114.297 146.899 114.237C147.041 114.178 147.197 114.148 147.366 114.148C147.511 114.148 147.648 114.174 147.775 114.224C147.903 114.271 148.014 114.344 148.109 114.442C148.207 114.537 148.284 114.654 148.341 114.794C148.397 114.93 148.425 115.087 148.425 115.266C148.425 115.286 148.425 115.306 148.425 115.323C148.425 115.338 148.424 115.358 148.421 115.381H146.596C146.599 115.485 146.62 115.582 146.658 115.671C146.7 115.76 146.753 115.837 146.818 115.902C146.887 115.967 146.967 116.019 147.059 116.058C147.154 116.093 147.256 116.111 147.366 116.111C147.538 116.111 147.679 116.077 147.789 116.009C147.901 115.938 147.992 115.843 148.06 115.724L148.363 115.933C148.262 116.096 148.127 116.225 147.958 116.32C147.792 116.415 147.593 116.463 147.361 116.463ZM148.034 115.07C148.019 114.978 147.991 114.896 147.949 114.825C147.91 114.754 147.86 114.693 147.798 114.642C147.738 114.592 147.67 114.553 147.593 114.527C147.516 114.5 147.436 114.487 147.353 114.487C147.269 114.487 147.188 114.5 147.108 114.527C147.028 114.553 146.955 114.592 146.89 114.642C146.824 114.69 146.768 114.751 146.72 114.825C146.673 114.896 146.64 114.978 146.623 115.07H148.034ZM149.061 114.193H149.444V114.536C149.521 114.402 149.622 114.304 149.747 114.242C149.871 114.179 150.006 114.148 150.152 114.148C150.276 114.148 150.391 114.169 150.494 114.211C150.598 114.252 150.686 114.313 150.757 114.393C150.831 114.47 150.889 114.565 150.931 114.678C150.972 114.788 150.993 114.911 150.993 115.047V116.418H150.615V115.105C150.615 114.918 150.566 114.771 150.468 114.665C150.373 114.555 150.247 114.5 150.089 114.5C150 114.5 149.916 114.518 149.836 114.553C149.759 114.589 149.69 114.642 149.631 114.714C149.575 114.782 149.529 114.866 149.493 114.967C149.46 115.068 149.444 115.184 149.444 115.314V116.418H149.061V114.193ZM152.683 116.472C152.552 116.472 152.429 116.457 152.314 116.427C152.198 116.401 152.091 116.362 151.993 116.312C151.898 116.258 151.815 116.197 151.744 116.129C151.673 116.058 151.616 115.982 151.575 115.902L151.909 115.653C151.995 115.786 152.101 115.892 152.229 115.969C152.36 116.046 152.514 116.085 152.692 116.085C152.855 116.085 152.993 116.043 153.106 115.96C153.219 115.877 153.275 115.761 153.275 115.613C153.275 115.485 153.236 115.378 153.159 115.292C153.082 115.206 152.969 115.135 152.821 115.079L152.403 114.918C152.153 114.826 151.971 114.712 151.855 114.576C151.742 114.439 151.686 114.263 151.686 114.046C151.686 113.918 151.711 113.803 151.762 113.699C151.812 113.595 151.88 113.506 151.966 113.432C152.055 113.358 152.159 113.301 152.278 113.263C152.4 113.224 152.532 113.205 152.674 113.205C152.873 113.205 153.051 113.245 153.208 113.325C153.368 113.405 153.498 113.509 153.595 113.636L153.293 113.904C153.213 113.809 153.122 113.733 153.021 113.677C152.92 113.62 152.802 113.592 152.665 113.592C152.588 113.592 152.514 113.602 152.443 113.623C152.374 113.644 152.314 113.674 152.26 113.712C152.21 113.751 152.17 113.797 152.14 113.85C152.11 113.904 152.095 113.963 152.095 114.028C152.095 114.162 152.134 114.266 152.211 114.34C152.291 114.411 152.411 114.476 152.572 114.536L152.955 114.682C153.189 114.771 153.37 114.887 153.498 115.03C153.625 115.172 153.689 115.36 153.689 115.595C153.689 115.728 153.664 115.85 153.613 115.96C153.563 116.067 153.493 116.159 153.404 116.236C153.315 116.31 153.208 116.368 153.084 116.409C152.962 116.451 152.828 116.472 152.683 116.472ZM155.312 116.463C155.139 116.463 154.982 116.433 154.84 116.374C154.697 116.314 154.576 116.233 154.475 116.129C154.374 116.025 154.295 115.904 154.239 115.764C154.185 115.622 154.159 115.469 154.159 115.306C154.159 115.142 154.187 114.991 154.243 114.852C154.3 114.709 154.378 114.586 154.479 114.482C154.583 114.378 154.706 114.297 154.849 114.237C154.991 114.178 155.147 114.148 155.316 114.148C155.461 114.148 155.598 114.174 155.725 114.224C155.853 114.271 155.964 114.344 156.059 114.442C156.157 114.537 156.234 114.654 156.291 114.794C156.347 114.93 156.375 115.087 156.375 115.266C156.375 115.286 156.375 115.306 156.375 115.323C156.375 115.338 156.374 115.358 156.371 115.381H154.546C154.549 115.485 154.57 115.582 154.608 115.671C154.65 115.76 154.703 115.837 154.768 115.902C154.837 115.967 154.917 116.019 155.009 116.058C155.104 116.093 155.206 116.111 155.316 116.111C155.488 116.111 155.629 116.077 155.739 116.009C155.852 115.938 155.942 115.843 156.01 115.724L156.313 115.933C156.212 116.096 156.077 116.225 155.908 116.32C155.742 116.415 155.543 116.463 155.312 116.463ZM155.984 115.07C155.969 114.978 155.941 114.896 155.899 114.825C155.86 114.754 155.81 114.693 155.748 114.642C155.688 114.592 155.62 114.553 155.543 114.527C155.466 114.5 155.386 114.487 155.303 114.487C155.22 114.487 155.138 114.5 155.058 114.527C154.978 114.553 154.905 114.592 154.84 114.642C154.774 114.69 154.718 114.751 154.671 114.825C154.623 114.896 154.59 114.978 154.573 115.07H155.984ZM157.928 116.463C157.771 116.463 157.626 116.433 157.492 116.374C157.361 116.312 157.247 116.228 157.149 116.125C157.051 116.018 156.974 115.895 156.918 115.755C156.864 115.616 156.838 115.466 156.838 115.306C156.838 115.145 156.864 114.996 156.918 114.856C156.974 114.717 157.051 114.595 157.149 114.491C157.247 114.384 157.361 114.301 157.492 114.242C157.626 114.179 157.771 114.148 157.928 114.148C158.097 114.148 158.252 114.187 158.391 114.264C158.531 114.338 158.637 114.429 158.712 114.536V114.193H159.094V116.418H158.712V116.076C158.637 116.182 158.531 116.274 158.391 116.352C158.252 116.426 158.097 116.463 157.928 116.463ZM157.986 116.111C158.099 116.111 158.201 116.09 158.293 116.049C158.385 116.007 158.464 115.951 158.529 115.88C158.597 115.806 158.649 115.72 158.685 115.622C158.723 115.524 158.743 115.418 158.743 115.306C158.743 115.193 158.723 115.087 158.685 114.99C158.649 114.892 158.597 114.807 158.529 114.736C158.464 114.662 158.385 114.604 158.293 114.562C158.201 114.521 158.099 114.5 157.986 114.5C157.873 114.5 157.769 114.521 157.675 114.562C157.583 114.604 157.502 114.662 157.434 114.736C157.369 114.807 157.317 114.892 157.278 114.99C157.243 115.087 157.225 115.193 157.225 115.306C157.225 115.418 157.243 115.524 157.278 115.622C157.317 115.72 157.369 115.806 157.434 115.88C157.502 115.951 157.583 116.007 157.675 116.049C157.769 116.09 157.873 116.111 157.986 116.111Z" fill="#037DD6"/>
-</g>
-<g style="mix-blend-mode:multiply" filter="url(#filter1_i_4806_28636)">
-<path d="M150.528 171.252C195.797 154.113 221.158 106.134 221.158 72.1851C221.158 13.6459 161.529 2.73489 140.607 11.1653C138.289 12.0992 121.333 -12.3547 42.3348 11.1653C20.7826 17.582 28.1328 91.4057 19.7638 91.925C11.3949 92.4444 2.54946 119.706 13.4545 141.908C24.3596 164.111 98.2856 191.031 150.528 171.252Z" fill="white"/>
-</g>
-</g>
-<path d="M53.0979 59.9583C53.0979 58.9309 53.9309 58.0979 54.9583 58.0979H192.042C193.069 58.0979 193.902 58.9309 193.902 59.9583V66.9104H53.0979V59.9583Z" fill="#D4D4D4" stroke="#BEBEBE" stroke-width="0.195833"/>
-<path d="M112.853 60.2626H113.595L114.692 63.4929L115.782 60.2626H116.516V64.0833H116.024V61.8283C116.024 61.7503 116.026 61.6211 116.029 61.4408C116.033 61.2605 116.034 61.0671 116.034 60.8608L114.945 64.0833H114.432L113.335 60.8608V60.9778C113.335 61.0715 113.336 61.2145 113.34 61.407C113.345 61.5977 113.348 61.7382 113.348 61.8283V64.0833H112.853V60.2626ZM118.401 61.2353C118.599 61.2353 118.79 61.2821 118.976 61.3758C119.162 61.4677 119.303 61.5873 119.4 61.7347C119.494 61.8752 119.556 62.039 119.587 62.2263C119.615 62.3546 119.629 62.5592 119.629 62.8401H117.587C117.596 63.1227 117.663 63.3499 117.787 63.5215C117.912 63.6915 118.106 63.7764 118.367 63.7764C118.612 63.7764 118.807 63.6958 118.953 63.5345C119.036 63.4409 119.095 63.3325 119.129 63.2094H119.59C119.578 63.3117 119.537 63.4262 119.468 63.5527C119.4 63.6776 119.324 63.7799 119.239 63.8596C119.096 63.9984 118.92 64.092 118.711 64.1405C118.598 64.1683 118.471 64.1822 118.328 64.1822C117.982 64.1822 117.688 64.0565 117.447 63.805C117.206 63.5519 117.085 63.1982 117.085 62.7439C117.085 62.2965 117.206 61.9332 117.449 61.6541C117.692 61.3749 118.009 61.2353 118.401 61.2353ZM119.148 62.4682C119.129 62.2653 119.084 62.1032 119.015 61.9818C118.887 61.7564 118.673 61.6437 118.373 61.6437C118.158 61.6437 117.977 61.7217 117.832 61.8778C117.686 62.0321 117.609 62.2289 117.6 62.4682H119.148ZM120.3 60.5201H120.773V61.2978H121.218V61.6801H120.773V63.4981C120.773 63.5952 120.806 63.6602 120.872 63.6932C120.908 63.7123 120.969 63.7218 121.054 63.7218C121.077 63.7218 121.101 63.7218 121.127 63.7218C121.153 63.7201 121.183 63.7175 121.218 63.714V64.0833C121.164 64.0989 121.108 64.1102 121.049 64.1171C120.992 64.1241 120.929 64.1275 120.862 64.1275C120.643 64.1275 120.495 64.0721 120.417 63.9611C120.339 63.8484 120.3 63.7027 120.3 63.5241V61.6801H119.923V61.2978H120.3V60.5201ZM122.048 63.3421C122.048 63.4773 122.097 63.584 122.196 63.662C122.295 63.74 122.412 63.779 122.547 63.779C122.712 63.779 122.871 63.7409 123.026 63.6646C123.286 63.538 123.416 63.3308 123.416 63.043V62.6658C123.359 62.7022 123.285 62.7326 123.195 62.7569C123.104 62.7811 123.016 62.7985 122.929 62.8089L122.646 62.8453C122.476 62.8678 122.348 62.9034 122.264 62.9519C122.12 63.0334 122.048 63.1635 122.048 63.3421ZM123.182 62.3953C123.289 62.3815 123.361 62.3364 123.398 62.2601C123.418 62.2185 123.429 62.1587 123.429 62.0806C123.429 61.9211 123.372 61.8058 123.257 61.7347C123.144 61.6619 122.982 61.6255 122.771 61.6255C122.526 61.6255 122.353 61.6914 122.251 61.8231C122.193 61.896 122.156 62.0043 122.139 62.1483H121.702C121.71 61.8049 121.821 61.5665 122.035 61.433C122.25 61.2978 122.498 61.2301 122.781 61.2301C123.109 61.2301 123.375 61.2926 123.58 61.4174C123.782 61.5422 123.884 61.7364 123.884 62V63.6048C123.884 63.6533 123.893 63.6923 123.913 63.7218C123.933 63.7513 123.976 63.766 124.04 63.766C124.061 63.766 124.084 63.7652 124.11 63.7634C124.136 63.7599 124.164 63.7556 124.193 63.7504V64.0963C124.121 64.1171 124.065 64.1301 124.027 64.1353C123.989 64.1405 123.937 64.1431 123.871 64.1431C123.71 64.1431 123.593 64.0859 123.52 63.9715C123.482 63.9108 123.455 63.825 123.439 63.714C123.344 63.8388 123.207 63.9472 123.028 64.0391C122.85 64.131 122.653 64.177 122.438 64.177C122.179 64.177 121.968 64.0989 121.803 63.9429C121.64 63.7851 121.559 63.5883 121.559 63.3525C121.559 63.0941 121.639 62.8938 121.801 62.7517C121.962 62.6095 122.173 62.5219 122.435 62.489L123.182 62.3953ZM124.703 60.2626H125.444L126.542 63.4929L127.632 60.2626H128.365V64.0833H127.874V61.8283C127.874 61.7503 127.875 61.6211 127.879 61.4408C127.882 61.2605 127.884 61.0671 127.884 60.8608L126.794 64.0833H126.282L125.184 60.8608V60.9778C125.184 61.0715 125.186 61.2145 125.19 61.407C125.195 61.5977 125.197 61.7382 125.197 61.8283V64.0833H124.703V60.2626ZM129.45 63.3421C129.45 63.4773 129.499 63.584 129.598 63.662C129.697 63.74 129.814 63.779 129.949 63.779C130.114 63.779 130.273 63.7409 130.428 63.6646C130.688 63.538 130.818 63.3308 130.818 63.043V62.6658C130.761 62.7022 130.687 62.7326 130.597 62.7569C130.507 62.7811 130.418 62.7985 130.332 62.8089L130.048 62.8453C129.878 62.8678 129.751 62.9034 129.666 62.9519C129.522 63.0334 129.45 63.1635 129.45 63.3421ZM130.584 62.3953C130.691 62.3815 130.763 62.3364 130.8 62.2601C130.821 62.2185 130.831 62.1587 130.831 62.0806C130.831 61.9211 130.774 61.8058 130.659 61.7347C130.547 61.6619 130.384 61.6255 130.173 61.6255C129.928 61.6255 129.755 61.6914 129.653 61.8231C129.595 61.896 129.558 62.0043 129.541 62.1483H129.104C129.113 61.8049 129.224 61.5665 129.437 61.433C129.652 61.2978 129.901 61.2301 130.183 61.2301C130.511 61.2301 130.777 61.2926 130.982 61.4174C131.185 61.5422 131.286 61.7364 131.286 62V63.6048C131.286 63.6533 131.296 63.6923 131.315 63.7218C131.336 63.7513 131.378 63.766 131.442 63.766C131.463 63.766 131.486 63.7652 131.512 63.7634C131.538 63.7599 131.566 63.7556 131.596 63.7504V64.0963C131.523 64.1171 131.467 64.1301 131.429 64.1353C131.391 64.1405 131.339 64.1431 131.273 64.1431C131.112 64.1431 130.995 64.0859 130.922 63.9715C130.884 63.9108 130.857 63.825 130.841 63.714C130.746 63.8388 130.609 63.9472 130.43 64.0391C130.252 64.131 130.055 64.177 129.84 64.177C129.582 64.177 129.37 64.0989 129.205 63.9429C129.042 63.7851 128.961 63.5883 128.961 63.3525C128.961 63.0941 129.042 62.8938 129.203 62.7517C129.364 62.6095 129.576 62.5219 129.837 62.489L130.584 62.3953ZM132.334 63.2094C132.348 63.3655 132.387 63.4851 132.451 63.5683C132.569 63.7192 132.774 63.7946 133.065 63.7946C133.239 63.7946 133.391 63.7573 133.523 63.6828C133.655 63.6065 133.721 63.4895 133.721 63.3317C133.721 63.212 133.668 63.121 133.562 63.0586C133.494 63.0204 133.361 62.9762 133.161 62.9259L132.789 62.8323C132.552 62.7733 132.377 62.7074 132.264 62.6346C132.063 62.508 131.962 62.3329 131.962 62.1092C131.962 61.8457 132.057 61.6324 132.246 61.4694C132.437 61.3064 132.692 61.2249 133.013 61.2249C133.433 61.2249 133.735 61.348 133.921 61.5943C134.037 61.7503 134.093 61.9185 134.09 62.0988H133.648C133.639 61.9931 133.602 61.8968 133.536 61.8101C133.428 61.687 133.242 61.6255 132.977 61.6255C132.8 61.6255 132.665 61.6593 132.574 61.7269C132.483 61.7945 132.438 61.8838 132.438 61.9948C132.438 62.1162 132.498 62.2133 132.618 62.2861C132.687 62.3294 132.789 62.3676 132.925 62.4005L133.234 62.476C133.571 62.5575 133.796 62.6364 133.91 62.7126C134.092 62.8323 134.184 63.0204 134.184 63.277C134.184 63.525 134.089 63.7391 133.9 63.9195C133.713 64.0998 133.427 64.19 133.042 64.19C132.627 64.19 132.333 64.0963 132.16 63.9091C131.988 63.7201 131.896 63.4869 131.884 63.2094H132.334ZM134.709 60.2626H135.159V62.4812L136.36 61.2978H136.959L135.892 62.3407L137.018 64.0833H136.42L135.552 62.6788L135.159 63.0378V64.0833H134.709V60.2626Z" fill="black"/>
-<circle cx="74.3459" cy="62.5042" r="2.35" fill="#29CA42" stroke="#1AAA26" stroke-width="0.391667"/>
-<circle cx="66.5124" cy="62.5042" r="2.35" fill="#FFBD2E" stroke="#DEA42B" stroke-width="0.391667"/>
-<circle cx="58.6791" cy="62.5042" r="2.35" fill="#FF5F57" stroke="#E0423D" stroke-width="0.391667"/>
-<path d="M222.363 35.755C224.574 29.2204 197.714 41.2126 204.367 51.6178C211.02 62.023 230.114 67.0699 221.346 57.4754C213.929 49.3667 218.835 46.1858 222.363 35.755Z" fill="#B9E0FF"/>
-<path d="M42.603 126.258C42.3811 126.888 41.6799 127.216 41.0497 126.994C38.52 126.098 37.6235 124.394 36.8957 123.028C36.2389 121.785 35.7152 120.8 34.082 120.214C32.4488 119.638 31.4192 120.064 30.1233 120.614C28.7032 121.217 26.928 121.963 24.3983 121.066C21.8687 120.17 20.9722 118.466 20.2533 117.1C19.5964 115.857 19.0728 114.872 17.4396 114.287C15.8064 113.71 14.7768 114.136 13.4809 114.686C12.0607 115.289 10.2855 116.044 7.76477 115.139C5.23511 114.242 4.33864 112.538 3.61968 111.172C2.96286 109.929 2.43918 108.944 0.806003 108.359C0.175809 108.137 -0.152603 107.436 0.0692966 106.806C0.291196 106.176 0.992398 105.847 1.62259 106.069C4.15225 106.966 5.04872 108.669 5.76767 110.036C6.42449 111.278 6.94818 112.263 8.58136 112.849C10.2145 113.426 11.2441 113 12.54 112.45C13.9602 111.846 15.7354 111.101 18.2562 111.997C20.7858 112.893 21.6823 114.597 22.4012 115.964C23.0581 117.206 23.5818 118.191 25.2149 118.777C26.8481 119.354 27.8777 118.928 29.1736 118.378C30.5938 117.774 32.369 117.029 34.8986 117.925C37.4283 118.821 38.3247 120.525 39.0526 121.892C39.7094 123.134 40.2331 124.119 41.8663 124.705C42.4965 124.927 42.8249 125.619 42.603 126.258Z" fill="#83FEB9"/>
-<path d="M34.9703 57.9076C30.6654 57.9076 27.1594 54.4023 27.1594 50.0984C27.1594 45.7945 30.6654 42.2892 34.9703 42.2892C39.2751 42.2892 42.7811 45.7945 42.7811 50.0984C42.7811 54.4023 39.2751 57.9076 34.9703 57.9076ZM34.9703 44.2415C31.7394 44.2415 29.1121 46.8682 29.1121 50.0984C29.1121 53.3286 31.7394 55.9553 34.9703 55.9553C38.2011 55.9553 40.8284 53.3286 40.8284 50.0984C40.8284 46.8682 38.2011 44.2415 34.9703 44.2415Z" fill="#FFD33D"/>
-<path d="M24.4507 78.9591C25.2792 78.9591 25.9508 78.2877 25.9508 77.4594C25.9508 76.6312 25.2792 75.9597 24.4507 75.9597C23.6223 75.9597 22.9507 76.6312 22.9507 77.4594C22.9507 78.2877 23.6223 78.9591 24.4507 78.9591Z" fill="url(#paint1_linear_4806_28636)"/>
-<path d="M269.5 63.9994C270.328 63.9994 271 63.328 271 62.4997C271 61.6714 270.328 61 269.5 61C268.672 61 268 61.6714 268 62.4997C268 63.328 268.672 63.9994 269.5 63.9994Z" fill="#FFD33D"/>
-<path d="M93.7233 17.0986C90.9362 17.0986 88.6729 14.8358 88.6729 12.0493C88.6729 9.26288 90.9362 7 93.7233 7C96.5103 7 98.7737 9.26288 98.7737 12.0493C98.7737 14.8358 96.5014 17.0986 93.7233 17.0986ZM93.7233 8.63282C91.8416 8.63282 90.306 10.168 90.306 12.0493C90.306 13.9306 91.8416 15.4658 93.7233 15.4658C95.605 15.4658 97.1405 13.9306 97.1405 12.0493C97.1405 10.168 95.605 8.63282 93.7233 8.63282Z" fill="#86E29B"/>
-<path d="M254.05 137.099C251.263 137.099 249 134.836 249 132.049C249 129.263 251.263 127 254.05 127C256.837 127 259.101 129.263 259.101 132.049C259.101 134.836 256.829 137.099 254.05 137.099ZM254.05 128.633C252.169 128.633 250.633 130.168 250.633 132.049C250.633 133.931 252.169 135.466 254.05 135.466C255.932 135.466 257.468 133.931 257.468 132.049C257.468 130.168 255.932 128.633 254.05 128.633Z" fill="#86E29B"/>
-<path d="M176.125 164.812C175.904 164.812 175.683 164.757 175.49 164.66L162.747 158.055C162.291 157.821 162.014 157.365 162.001 156.853C161.987 156.342 162.249 155.872 162.692 155.61L181.972 144.196C182.483 143.892 183.119 143.947 183.575 144.321C184.031 144.694 184.197 145.315 183.99 145.868L177.425 163.887C177.286 164.26 176.996 164.564 176.623 164.702C176.471 164.785 176.291 164.812 176.125 164.812ZM166.257 156.729L175.365 161.455L180.051 148.59L166.257 156.729Z" fill="url(#paint2_linear_4806_28636)"/>
-<defs>
-<filter id="filter0_d_4806_28636" x="35.7548" y="41.262" width="175.49" height="283.49" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="0.507212"/>
-<feGaussianBlur stdDeviation="8.6226"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.18 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4806_28636"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4806_28636" result="shape"/>
-</filter>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_4806_28636" transform="translate(-0.0821918 -0.0400071) scale(0.00267674 0.00151475)"/>
-</pattern>
-<pattern id="pattern1" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image1_4806_28636" transform="translate(0 -0.0223214) scale(0.000625 0.00116071)"/>
-</pattern>
-<filter id="filter1_i_4806_28636" x="8.38379" y="-3.39487" width="212.774" height="181.531" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="-4.3113"/>
-<feGaussianBlur stdDeviation="5.57933"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.14 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4806_28636"/>
-</filter>
-<linearGradient id="paint0_linear_4806_28636" x1="-0.14423" y1="143.14" x2="221" y2="21.2827" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFC87D"/>
-<stop offset="0.260417" stop-color="#FAB482"/>
-<stop offset="0.84375" stop-color="#FD6C73"/>
-<stop offset="1" stop-color="#D34676"/>
-</linearGradient>
-<linearGradient id="paint1_linear_4806_28636" x1="22.9458" y1="77.4631" x2="25.9499" y2="77.4631" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C4FD"/>
-<stop offset="1" stop-color="#75C4FD"/>
-</linearGradient>
-<linearGradient id="paint2_linear_4806_28636" x1="169.297" y1="162.715" x2="176.01" y2="141.819" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE566"/>
-<stop offset="1" stop-color="#FFB0EB"/>
-</linearGradient>
-<clipPath id="clip0_4806_28636">
-<rect x="63" y="78" width="121.29" height="45.8694" rx="1.48367" fill="white"/>
-</clipPath>
-<image id="image0_4806_28636" width="435" height="713" xlink:href="data:image/png;base64,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"/>
-<image id="image1_4806_28636" width="1600" height="900" xlink:href="data:image/png;base64,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tdq9unqX4a6lNWiNtKZnd+ruy3sC9jTWOtRuqdOtK9sL9kr3Pt+Xtu/G/rD9LQeYB2oPWh6sPEQ/VFqP1E+t72vIauhqTG7saAptamn2aj502PHwjiOmRyqO6hxdeoxybP6xgePFx/tPiE/0nsw8+ahlYsudU0mnrrVGt7afDjt97kzQmVNnWWePn/M+d+S85/mmC8wLDRfdLta3ubYd+t3190Ptbu31l9wvNV72uNzcMabj2BXfKyevBlw9c41z7eL1iOsdN+Jv3OxM7ey6yb/57FburVe3i25/vjP7LuFu6T2Ne+X3De9X/WH7R12XW9fRBwEP2h7GPrzziPfoxeOCx1+65z+hPil/avK0+pnzsyM9QT2Xn4973v1C/OJzb8mfmn9WvrR5efAvv7/a+pL6ul9JXg28XvxG/82Oty5vW/qj+u+/y3v3+X3pB/0POz8yP579lPjp6efJX0hf1n61/dr8Lezb3YG8gQExV8KV/wpgsKIZGQC83gEANRkAOjyfUcYpzn/ygijOrHIE/hNWnBHlxQ2AWvj/Ht0L/246Adi7DR6/oL56KgBRVADiPAA6evRQHTyryc+VskKE54DNnK/peeng3xTFmfOHuH9ugUzVBfzc/guoL3xYVt1q+wAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAGQKADAAQAAAABAAADhAAAAADx5OC6AABAAElEQVR4AezdXawkR70g+KzT9NAeWbdtYUGv3Dbu1h246xkwLe2DQYtHDRrBagdbaHSRbgNaC16aB8beka4f1/LTleyXvuLBfgF5ZfsgXZ4Ms6vlAXvUlgzzAliasQBpu/11x23rWrRn2XHvbfepjciqrFPno86pj8ysiMxfSd1VpyozMuIXWVmZ8c+IKAoPAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBxQUGi69iDQL9FLjrsddfKIrB2RRLf2XzW6ev/f7i5RTzJk8ECBAgQIAAAQIECBAgQIAAAQIECBBYh8BH1rFR2ySQosCxT993KsV8zZOnE+eeuf/K5rd/OmtZwZFZMt4nQIAAAQIECBAgQIAAAQIECBAgQKCrAnqAdLVmletAgRjsiEGB6ecQRPhhqj08DizMHB9WPUSmyysoMgecRQgQIECAAAECBAgQIECAAAECBAgQyFZAACTbqpPxZQTCMFYPhSDHhWXW7eo6rz16p+NAVytXuQgQIECAAAECBAgQIECAAAECBAj0WEDDZ48rv8tFjz0dtnt0DF8c9eyonrtc8mXKVrlMnh9+7dFP/u0yKVmHAAECBAgQIECAAAECBAgQIECAAAECqQgIgKRSE/KxksCoZ0fxwM5E0pywfGceU/0rBkN2PsIcI981bNZOE38RIECAAAECBAgQIECAAAECBAgQIJCugABIunUjZ4cIhKDHC2GR58O/EPgQ7DiEq4aPJ0GRaF7oJVIDqSQIECBAgAABAgQIECBAgAABAgQIEGhMQACkMVoJ1ykw7uExnaSgx7TGWl4PH642KxhSSXgmQIAAAQIECBAgQIAAAQIECBAgQCAVAQGQVGpCPvYI7Ax6mLh8D1BSb2wHQ8JQWT81VFZSlSMzBAgQIECAAAECBAgQIECAAAECBHopIADSy2pPt9Bx8vKYuzCB+f1hWKsL6eZU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S1iuCBAgQIAAAQIECBAgQIAAAQIECOQuIACSewlNPH3L+UI6hWf1Dukocvy7uNalKgU/3hT46DT8JUCAAAECBAgQIECAAAECBAgQIEBgDAEBkDHU7XMrAcGQrdgGXOkw4BE7MbfHgNQ2TYAAAQIECBAgQIAAAQIECBAgQIDAxgICIBuTWSEHgRgmqx0ia5Z6hczeSP/0Dhm8YBY3lrsIbwGPwb3tgAABAgQIECBAgAABAgQIECBAgACBXQQEQHbRs25WAsseIhEQWXnMn1p54elGAgcBj2atmNPDsFYbAVqYAAECBAgQIECAAAECBAgQIECAAIERBQRARsS36+EFvvDD9xazWTTkRyCk+zv8fsvbQ2dz8PeaIa3KK0UpJkCAAAECBAgQIECAAAECBAgQIEDgUEAA5NDCswkItL1E5j+eQFbXzuK7Lz3qOLC2lgUJECBAgAABAgQIECBAgAABAgQIEChFQMNnKSUlnb0KxBwiR4dzSsGRX7c9RXrdVRYbu3P9O1eO5jeLhEkEAQIECBAgQIAAAQIECBAgQIAAAQIEBhIQABkI1mbLE4igyGmpTpOu/3O+AZLFtTRHx5snpV/w4yQZ7xMgQIAAAQIECBAgQIAAAQIECBAgUKvA39WaMfkisKlAyUGCCH6UnP5Ny8ryBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEA0pIIEAAAN8UlEQVSAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwP/fDh0LAAAAAAzytx7FvkLIgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYOAYCR0MRkUfqHdUAAAAASUVORK5CYII="/>
-</defs>
-</svg>
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 455fcdc1e..c33e0f12a 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -67,7 +67,6 @@ export default class PreferencesController {
         : LedgerTransportTypes.u2f,
       transactionSecurityCheckEnabled: false,
       theme: ThemeType.os,
-      openSeaTransactionSecurityProviderPopoverHasBeenShown: false,
       ...opts.initState,
     };
 
@@ -204,16 +203,6 @@ export default class PreferencesController {
     });
   }
 
-  /**
-   * Setter for the `openSeaTransactionSecurityProviderPopoverHasBeenShown` property
-   *
-   */
-  setOpenSeaTransactionSecurityProviderPopoverHasBeenShown() {
-    this.store.updateState({
-      openSeaTransactionSecurityProviderPopoverHasBeenShown: true,
-    });
-  }
-
   /**
    * Add new methodData to state, to avoid requesting this information again through Infura
    *
diff --git a/app/scripts/controllers/preferences.test.js b/app/scripts/controllers/preferences.test.js
index f129de940..21267195c 100644
--- a/app/scripts/controllers/preferences.test.js
+++ b/app/scripts/controllers/preferences.test.js
@@ -330,28 +330,4 @@ describe('preferences controller', function () {
       );
     });
   });
-
-  describe('setOpenSeaTransactionSecurityProviderPopoverHasBeenShown', function () {
-    it('should default to value "false"', function () {
-      const state = preferencesController.store.getState();
-      assert.equal(
-        state.openSeaTransactionSecurityProviderPopoverHasBeenShown,
-        false,
-      );
-    });
-
-    it('should set the openSeaTransactionSecurityProviderPopoverHasBeenShown to true', function () {
-      const state = preferencesController.store.getState();
-      assert.equal(
-        state.openSeaTransactionSecurityProviderPopoverHasBeenShown,
-        false,
-      );
-      preferencesController.setOpenSeaTransactionSecurityProviderPopoverHasBeenShown();
-      assert.equal(
-        preferencesController.store.getState()
-          .openSeaTransactionSecurityProviderPopoverHasBeenShown,
-        true,
-      );
-    });
-  });
 });
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 0a395106a..6a2c1107d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1861,10 +1861,6 @@ export default class MetamaskController extends EventEmitter {
         preferencesController.setTransactionSecurityCheckEnabled.bind(
           preferencesController,
         ),
-      setOpenSeaTransactionSecurityProviderPopoverHasBeenShown:
-        preferencesController.setOpenSeaTransactionSecurityProviderPopoverHasBeenShown.bind(
-          preferencesController,
-        ),
       // AssetsContractController
       getTokenStandardAndDetails: this.getTokenStandardAndDetails.bind(this),
 
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index a56197f4e..6fffc84a9 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -245,8 +245,6 @@ function defaultFixture() {
         useTokenDetection: false,
         useCurrencyRateCheck: true,
         useMultiAccountBalanceChecker: true,
-        transactionSecurityCheckEnabled: true,
-        openSeaTransactionSecurityProviderPopoverHasBeenShown: true,
       },
       SmartTransactionsController: {
         smartTransactionsState: {
@@ -360,8 +358,6 @@ function onboardingFixture() {
         useTokenDetection: false,
         useCurrencyRateCheck: true,
         useMultiAccountBalanceChecker: true,
-        transactionSecurityCheckEnabled: true,
-        openSeaTransactionSecurityProviderPopoverHasBeenShown: true,
       },
       SmartTransactionsController: {
         smartTransactionsState: {
diff --git a/ui/components/app/open-sea-whats-new-popover/index.js b/ui/components/app/open-sea-whats-new-popover/index.js
deleted file mode 100644
index abd91185e..000000000
--- a/ui/components/app/open-sea-whats-new-popover/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './open-sea-whats-new-popover';
diff --git a/ui/components/app/open-sea-whats-new-popover/index.scss b/ui/components/app/open-sea-whats-new-popover/index.scss
deleted file mode 100644
index ff307b957..000000000
--- a/ui/components/app/open-sea-whats-new-popover/index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.open-sea-whats-new-popover {
-  &__enable-security-provider-button {
-    width: fit-content;
-    font-weight: 400;
-  }
-}
diff --git a/ui/components/app/open-sea-whats-new-popover/open-sea-whats-new-popover.js b/ui/components/app/open-sea-whats-new-popover/open-sea-whats-new-popover.js
deleted file mode 100644
index 30bfda33a..000000000
--- a/ui/components/app/open-sea-whats-new-popover/open-sea-whats-new-popover.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import React, { useContext } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
-import { I18nContext } from '../../../contexts/i18n';
-import Popover from '../../ui/popover';
-import {
-  DISPLAY,
-  FLEX_DIRECTION,
-  FONT_WEIGHT,
-  TextColor,
-  TextVariant,
-} from '../../../helpers/constants/design-system';
-import Button from '../../ui/button';
-import Box from '../../ui/box';
-import {
-  setOpenSeaTransactionSecurityProviderPopoverHasBeenShown,
-  setTransactionSecurityCheckEnabled,
-} from '../../../store/actions';
-import { getHasTheOpenSeaTransactionSecurityProviderPopoverBeenShown } from '../../../selectors';
-import { Text } from '../../component-library';
-import { EXPERIMENTAL_ROUTE } from '../../../helpers/constants/routes';
-
-export default function OpenSeaWhatsNewPopover() {
-  const t = useContext(I18nContext);
-  const dispatch = useDispatch();
-  const history = useHistory();
-
-  const hasThePopoverBeenShown = useSelector(
-    getHasTheOpenSeaTransactionSecurityProviderPopoverBeenShown,
-  );
-
-  return (
-    process.env.TRANSACTION_SECURITY_PROVIDER &&
-    !hasThePopoverBeenShown && (
-      <Popover
-        title={
-          <Text
-            variant={TextVariant.headingSm}
-            color={TextColor.textAlternative}
-            fontWeight={FONT_WEIGHT.BOLD}
-          >
-            {t('staySafeWithOpenSea')}
-          </Text>
-        }
-        footer={
-          <>
-            <Button
-              type="primary"
-              onClick={() => {
-                dispatch(setTransactionSecurityCheckEnabled(true));
-                dispatch(
-                  setOpenSeaTransactionSecurityProviderPopoverHasBeenShown(),
-                );
-                history.push(
-                  `${EXPERIMENTAL_ROUTE}#transaction-security-check`,
-                );
-              }}
-              className="open-sea-whats-new-popover__enable-security-provider-button"
-            >
-              {t('enableOpenSeaSecurityProvider')}
-            </Button>
-            <Box marginTop={2}>
-              <Text variant={TextVariant.bodySm}>
-                <Button
-                  type="link"
-                  onClick={() =>
-                    dispatch(
-                      setOpenSeaTransactionSecurityProviderPopoverHasBeenShown(),
-                    )
-                  }
-                >
-                  {t('notNow')}
-                </Button>
-              </Text>
-            </Box>
-          </>
-        }
-        footerClassName="smart-transactions-popover__footer"
-        className="smart-transactions-popover"
-        onClose={() =>
-          dispatch(setOpenSeaTransactionSecurityProviderPopoverHasBeenShown())
-        }
-      >
-        <Box
-          paddingRight={6}
-          paddingLeft={6}
-          paddingTop={0}
-          paddingBottom={0}
-          display={DISPLAY.FLEX}
-          className="smart-transactions-popover__content"
-        >
-          <Box
-            marginTop={1}
-            marginBottom={1}
-            display={DISPLAY.FLEX}
-            flexDirection={FLEX_DIRECTION.COLUMN}
-          >
-            <img
-              src="./images/open-sea-security-provider.svg"
-              alt={t('openSeaAltText')}
-            />
-          </Box>
-          <Text variant={TextVariant.bodySm}>
-            {t('getWarningsFromOpenSea')}
-          </Text>
-          <Text
-            variant={TextVariant.bodySm}
-            marginTop={4}
-            fontWeight={FONT_WEIGHT.BOLD}
-          >
-            {t('openSeaDescription')}
-          </Text>
-          <Text
-            variant={TextVariant.bodySm}
-            color={TextColor.textAlternative}
-            marginTop={4}
-          >
-            {t('alwaysBeSureTo')}
-          </Text>
-        </Box>
-      </Popover>
-    )
-  );
-}
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 1d8c8330d..cdc666317 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -54,7 +54,6 @@ import {
   ONBOARDING_SECURE_YOUR_WALLET_ROUTE,
 } from '../../helpers/constants/routes';
 import ZENDESK_URLS from '../../helpers/constants/zendesk-url';
-import OpenSeaWhatsNewPopover from '../../components/app/open-sea-whats-new-popover/open-sea-whats-new-popover';
 ///: BEGIN:ONLY_INCLUDE_IN(main)
 import { SUPPORT_LINK } from '../../../shared/lib/ui-utils';
 ///: END:ONLY_INCLUDE_IN
@@ -632,7 +631,6 @@ export default class Home extends PureComponent {
         />
         <div className="home__container">
           {showWhatsNew ? <WhatsNewPopup onClose={hideWhatsNewPopup} /> : null}
-          {showWhatsNew ? <OpenSeaWhatsNewPopover /> : null}
           {!showWhatsNew && showRecoveryPhraseReminder ? (
             <RecoveryPhraseReminder
               hasBackedUp={seedPhraseBackedUp}
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 4fc7ba948..dea043e15 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1363,9 +1363,3 @@ export function getIsDesktopEnabled(state) {
   return state.metamask.desktopEnabled;
 }
 ///: END:ONLY_INCLUDE_IN
-
-export function getHasTheOpenSeaTransactionSecurityProviderPopoverBeenShown(
-  state,
-) {
-  return state.metamask.openSeaTransactionSecurityProviderPopoverHasBeenShown;
-}
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index a71cdb62e..913e7de0d 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -4575,12 +4575,11 @@ export function hideBetaHeader() {
 export function setTransactionSecurityCheckEnabled(
   transactionSecurityCheckEnabled: boolean,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
-  return async (dispatch) => {
+  return async () => {
     try {
       await submitRequestToBackground('setTransactionSecurityCheckEnabled', [
         transactionSecurityCheckEnabled,
       ]);
-      await forceUpdateMetamaskState(dispatch);
     } catch (error) {
       logErrorWithMessage(error);
     }
@@ -4591,19 +4590,6 @@ export function setFirstTimeUsedNetwork(chainId: string) {
   return submitRequestToBackground('setFirstTimeUsedNetwork', [chainId]);
 }
 
-export function setOpenSeaTransactionSecurityProviderPopoverHasBeenShown(): ThunkAction<
-  void,
-  MetaMaskReduxState,
-  unknown,
-  AnyAction
-> {
-  return async () => {
-    await submitRequestToBackground(
-      'setOpenSeaTransactionSecurityProviderPopoverHasBeenShown',
-    );
-  };
-}
-
 // QR Hardware Wallets
 export async function submitQRHardwareCryptoHDKey(cbor: Hex) {
   await submitRequestToBackground('submitQRHardwareCryptoHDKey', [cbor]);

From 34ba62470ad3dd13eb84004a65b82d7050f3a5bb Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Wed, 22 Mar 2023 18:06:05 +0000
Subject: [PATCH 050/129] bump contract metadata package version (#18278)

* bump contract metadata package version

* bump contract metadata package version
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index be6a45a14..6441e7a86 100644
--- a/package.json
+++ b/package.json
@@ -228,7 +228,7 @@
     "@metamask/approval-controller": "^1.0.0",
     "@metamask/assets-controllers": "^4.0.1",
     "@metamask/base-controller": "^1.0.0",
-    "@metamask/contract-metadata": "^2.2.0",
+    "@metamask/contract-metadata": "^2.3.1",
     "@metamask/controller-utils": "^1.0.0",
     "@metamask/design-tokens": "^1.9.0",
     "@metamask/desktop": "^0.3.0",
diff --git a/yarn.lock b/yarn.lock
index ddf886249..6e98cfa41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3704,10 +3704,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/contract-metadata@npm:^2.1.0, @metamask/contract-metadata@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "@metamask/contract-metadata@npm:2.2.0"
-  checksum: 31b94274c7c0a2d03377f3fa5e46574cde6607fd3a3b571cb7ffa4f7ce6dc90e2bfe2a4b2eb9eb4ebcd07cb7d6918da893356b699e91bc6e005b472ca7279370
+"@metamask/contract-metadata@npm:^2.1.0, @metamask/contract-metadata@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "@metamask/contract-metadata@npm:2.3.1"
+  checksum: 95dcc27f661a3e380c0cca8c6d90fb1777e31ab3fe16909fd5c67844125510e3f8e9eca05c9069fde34c77df3b66e56111c7a908a07623e88052ef147eff4315
   languageName: node
   linkType: hard
 
@@ -24259,7 +24259,7 @@ __metadata:
     "@metamask/assets-controllers": ^4.0.1
     "@metamask/auto-changelog": ^2.1.0
     "@metamask/base-controller": ^1.0.0
-    "@metamask/contract-metadata": ^2.2.0
+    "@metamask/contract-metadata": ^2.3.1
     "@metamask/controller-utils": ^1.0.0
     "@metamask/design-tokens": ^1.9.0
     "@metamask/desktop": ^0.3.0

From 349c9d4a03c100dbc056d6ff757d449b6638c22f Mon Sep 17 00:00:00 2001
From: Alex Donesky <adonesky@gmail.com>
Date: Wed, 22 Mar 2023 17:20:59 -0500
Subject: [PATCH 051/129] Refactor network client constructor (#17652)

---
 .../network/create-network-client.test.js     |   7 +
 .../network/create-network-client.ts          | 191 ++++++++++++++++++
 .../controllers/network/createInfuraClient.js |  49 -----
 .../network/createInfuraClient.test.js        |   5 -
 .../network/createJsonRpcClient.js            |  61 ------
 .../network/createJsonRpcClient.test.js       |   5 -
 .../controllers/network/network-controller.js |  32 ++-
 .../network/network-controller.test.js        |  10 +-
 .../network/provider-api-tests/helpers.js     |  22 +-
 .../provider-api-tests/shared-tests.js        |   6 +-
 lavamoat/browserify/beta/policy.json          |  54 ++---
 lavamoat/browserify/desktop/policy.json       |  54 ++---
 lavamoat/browserify/flask/policy.json         |  54 ++---
 lavamoat/browserify/main/policy.json          |  54 ++---
 package.json                                  |   7 +-
 shared/constants/network.ts                   |   9 +-
 types/eth-json-rpc-filters/index.d.ts         |   1 +
 .../subscriptionManager.d.ts                  |   1 +
 yarn.lock                                     |  71 ++++---
 19 files changed, 342 insertions(+), 351 deletions(-)
 create mode 100644 app/scripts/controllers/network/create-network-client.test.js
 create mode 100644 app/scripts/controllers/network/create-network-client.ts
 delete mode 100644 app/scripts/controllers/network/createInfuraClient.js
 delete mode 100644 app/scripts/controllers/network/createInfuraClient.test.js
 delete mode 100644 app/scripts/controllers/network/createJsonRpcClient.js
 delete mode 100644 app/scripts/controllers/network/createJsonRpcClient.test.js
 create mode 100644 types/eth-json-rpc-filters/index.d.ts
 create mode 100644 types/eth-json-rpc-filters/subscriptionManager.d.ts

diff --git a/app/scripts/controllers/network/create-network-client.test.js b/app/scripts/controllers/network/create-network-client.test.js
new file mode 100644
index 000000000..7e674392b
--- /dev/null
+++ b/app/scripts/controllers/network/create-network-client.test.js
@@ -0,0 +1,7 @@
+import { NetworkClientType } from './create-network-client';
+import { testsForProviderType } from './provider-api-tests/shared-tests';
+
+describe('createNetworkClient', () => {
+  testsForProviderType(NetworkClientType.Infura);
+  testsForProviderType(NetworkClientType.Custom);
+});
diff --git a/app/scripts/controllers/network/create-network-client.ts b/app/scripts/controllers/network/create-network-client.ts
new file mode 100644
index 000000000..6e96b71f5
--- /dev/null
+++ b/app/scripts/controllers/network/create-network-client.ts
@@ -0,0 +1,191 @@
+import {
+  createAsyncMiddleware,
+  createScaffoldMiddleware,
+  JsonRpcEngine,
+  mergeMiddleware,
+  JsonRpcMiddleware,
+} from 'json-rpc-engine';
+import {
+  createBlockCacheMiddleware,
+  createBlockRefMiddleware,
+  createBlockRefRewriteMiddleware,
+  createBlockTrackerInspectorMiddleware,
+  createInflightCacheMiddleware,
+  createFetchMiddleware,
+  createRetryOnEmptyMiddleware,
+} from '@metamask/eth-json-rpc-middleware';
+import {
+  providerFromEngine,
+  providerFromMiddleware,
+  SafeEventEmitterProvider,
+} from '@metamask/eth-json-rpc-provider';
+import { createInfuraMiddleware } from '@metamask/eth-json-rpc-infura';
+import type { Hex } from '@metamask/utils/dist';
+import { PollingBlockTracker } from 'eth-block-tracker/dist';
+import { SECOND } from '../../../../shared/constants/time';
+import {
+  BUILT_IN_INFURA_NETWORKS,
+  BuiltInInfuraNetwork,
+} from '../../../../shared/constants/network';
+
+export enum NetworkClientType {
+  Custom = 'custom',
+  Infura = 'infura',
+}
+
+type CustomNetworkConfiguration = {
+  chainId: Hex;
+  rpcUrl: string;
+  type: NetworkClientType.Custom;
+};
+
+type InfuraNetworkConfiguration = {
+  network: BuiltInInfuraNetwork;
+  infuraProjectId: string;
+  type: NetworkClientType.Infura;
+};
+
+/**
+ * Create a JSON RPC network client for a specific network.
+ *
+ * @param networkConfig - The network configuration.
+ * @returns
+ */
+export function createNetworkClient(
+  networkConfig: CustomNetworkConfiguration | InfuraNetworkConfiguration,
+): { provider: SafeEventEmitterProvider; blockTracker: PollingBlockTracker } {
+  const rpcApiMiddleware =
+    networkConfig.type === NetworkClientType.Infura
+      ? createInfuraMiddleware({
+          network: networkConfig.network,
+          projectId: networkConfig.infuraProjectId,
+          maxAttempts: 5,
+          source: 'metamask',
+        })
+      : createFetchMiddleware({
+          btoa: global.btoa,
+          fetch: global.fetch,
+          rpcUrl: networkConfig.rpcUrl,
+        });
+
+  const rpcProvider = providerFromMiddleware(rpcApiMiddleware);
+
+  const blockTrackerOpts =
+    process.env.IN_TEST && networkConfig.type === 'custom'
+      ? { pollingInterval: SECOND }
+      : {};
+  const blockTracker = new PollingBlockTracker({
+    ...blockTrackerOpts,
+    provider: rpcProvider,
+  });
+
+  const networkMiddleware =
+    networkConfig.type === NetworkClientType.Infura
+      ? createInfuraNetworkMiddleware({
+          blockTracker,
+          network: networkConfig.network,
+          rpcProvider,
+          rpcApiMiddleware,
+        })
+      : createCustomNetworkMiddleware({
+          blockTracker,
+          chainId: networkConfig.chainId,
+          rpcApiMiddleware,
+        });
+
+  const engine = new JsonRpcEngine();
+
+  engine.push(networkMiddleware);
+
+  const provider = providerFromEngine(engine);
+
+  return { provider, blockTracker };
+}
+
+function createInfuraNetworkMiddleware({
+  blockTracker,
+  network,
+  rpcProvider,
+  rpcApiMiddleware,
+}: {
+  blockTracker: PollingBlockTracker;
+  network: BuiltInInfuraNetwork;
+  rpcProvider: SafeEventEmitterProvider;
+  rpcApiMiddleware: JsonRpcMiddleware<unknown, unknown>;
+}) {
+  return mergeMiddleware([
+    createNetworkAndChainIdMiddleware({ network }),
+    createBlockCacheMiddleware({ blockTracker }),
+    createInflightCacheMiddleware(),
+    createBlockRefMiddleware({ blockTracker, provider: rpcProvider }),
+    createRetryOnEmptyMiddleware({ blockTracker, provider: rpcProvider }),
+    createBlockTrackerInspectorMiddleware({ blockTracker }),
+    rpcApiMiddleware,
+  ]);
+}
+
+function createNetworkAndChainIdMiddleware({
+  network,
+}: {
+  network: BuiltInInfuraNetwork;
+}) {
+  if (!BUILT_IN_INFURA_NETWORKS[network]) {
+    throw new Error(`createInfuraClient - unknown network "${network}"`);
+  }
+
+  const { chainId, networkId } = BUILT_IN_INFURA_NETWORKS[network];
+
+  return createScaffoldMiddleware({
+    eth_chainId: chainId,
+    net_version: networkId,
+  });
+}
+
+const createChainIdMiddleware = (
+  chainId: string,
+): JsonRpcMiddleware<unknown, unknown> => {
+  return (req, res, next, end) => {
+    if (req.method === 'eth_chainId') {
+      res.result = chainId;
+      return end();
+    }
+    return next();
+  };
+};
+
+function createCustomNetworkMiddleware({
+  blockTracker,
+  chainId,
+  rpcApiMiddleware,
+}: {
+  blockTracker: PollingBlockTracker;
+  chainId: string;
+  rpcApiMiddleware: any;
+}) {
+  const testMiddlewares = process.env.IN_TEST
+    ? [createEstimateGasDelayTestMiddleware()]
+    : [];
+
+  return mergeMiddleware([
+    ...testMiddlewares,
+    createChainIdMiddleware(chainId),
+    createBlockRefRewriteMiddleware({ blockTracker }),
+    createBlockCacheMiddleware({ blockTracker }),
+    createInflightCacheMiddleware(),
+    createBlockTrackerInspectorMiddleware({ blockTracker }),
+    rpcApiMiddleware,
+  ]);
+}
+
+/**
+ * For use in tests only.
+ * Adds a delay to `eth_estimateGas` calls.
+ */
+function createEstimateGasDelayTestMiddleware() {
+  return createAsyncMiddleware(async (req, _, next) => {
+    if (req.method === 'eth_estimateGas') {
+      await new Promise((resolve) => setTimeout(resolve, SECOND * 2));
+    }
+    return next();
+  });
+}
diff --git a/app/scripts/controllers/network/createInfuraClient.js b/app/scripts/controllers/network/createInfuraClient.js
deleted file mode 100644
index 76461eb62..000000000
--- a/app/scripts/controllers/network/createInfuraClient.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { createScaffoldMiddleware, mergeMiddleware } from 'json-rpc-engine';
-import {
-  createBlockRefMiddleware,
-  createRetryOnEmptyMiddleware,
-  createBlockCacheMiddleware,
-  createInflightCacheMiddleware,
-  createBlockTrackerInspectorMiddleware,
-  providerFromMiddleware,
-} from '@metamask/eth-json-rpc-middleware';
-
-import { createInfuraMiddleware } from '@metamask/eth-json-rpc-infura';
-import { PollingBlockTracker } from 'eth-block-tracker';
-
-import { BUILT_IN_NETWORKS } from '../../../../shared/constants/network';
-
-export default function createInfuraClient({ network, projectId }) {
-  const infuraMiddleware = createInfuraMiddleware({
-    network,
-    projectId,
-    maxAttempts: 5,
-    source: 'metamask',
-  });
-  const infuraProvider = providerFromMiddleware(infuraMiddleware);
-  const blockTracker = new PollingBlockTracker({ provider: infuraProvider });
-
-  const networkMiddleware = mergeMiddleware([
-    createNetworkAndChainIdMiddleware({ network }),
-    createBlockCacheMiddleware({ blockTracker }),
-    createInflightCacheMiddleware(),
-    createBlockRefMiddleware({ blockTracker, provider: infuraProvider }),
-    createRetryOnEmptyMiddleware({ blockTracker, provider: infuraProvider }),
-    createBlockTrackerInspectorMiddleware({ blockTracker }),
-    infuraMiddleware,
-  ]);
-  return { networkMiddleware, blockTracker };
-}
-
-function createNetworkAndChainIdMiddleware({ network }) {
-  if (!BUILT_IN_NETWORKS[network]) {
-    throw new Error(`createInfuraClient - unknown network "${network}"`);
-  }
-
-  const { chainId, networkId } = BUILT_IN_NETWORKS[network];
-
-  return createScaffoldMiddleware({
-    eth_chainId: chainId,
-    net_version: networkId,
-  });
-}
diff --git a/app/scripts/controllers/network/createInfuraClient.test.js b/app/scripts/controllers/network/createInfuraClient.test.js
deleted file mode 100644
index d1b1a7ccf..000000000
--- a/app/scripts/controllers/network/createInfuraClient.test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { testsForProviderType } from './provider-api-tests/shared-tests';
-
-describe('createInfuraClient', () => {
-  testsForProviderType('infura');
-});
diff --git a/app/scripts/controllers/network/createJsonRpcClient.js b/app/scripts/controllers/network/createJsonRpcClient.js
deleted file mode 100644
index b8cf0e7aa..000000000
--- a/app/scripts/controllers/network/createJsonRpcClient.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import { createAsyncMiddleware, mergeMiddleware } from 'json-rpc-engine';
-import {
-  createFetchMiddleware,
-  createBlockRefRewriteMiddleware,
-  createBlockCacheMiddleware,
-  createInflightCacheMiddleware,
-  createBlockTrackerInspectorMiddleware,
-  providerFromMiddleware,
-} from '@metamask/eth-json-rpc-middleware';
-import { PollingBlockTracker } from 'eth-block-tracker';
-import { SECOND } from '../../../../shared/constants/time';
-
-export default function createJsonRpcClient({ rpcUrl, chainId }) {
-  const blockTrackerOpts = process.env.IN_TEST
-    ? { pollingInterval: SECOND }
-    : {};
-  const fetchMiddleware = createFetchMiddleware({ rpcUrl });
-  const blockProvider = providerFromMiddleware(fetchMiddleware);
-  const blockTracker = new PollingBlockTracker({
-    ...blockTrackerOpts,
-    provider: blockProvider,
-  });
-  const testMiddlewares = process.env.IN_TEST
-    ? [createEstimateGasDelayTestMiddleware()]
-    : [];
-
-  const networkMiddleware = mergeMiddleware([
-    ...testMiddlewares,
-    createChainIdMiddleware(chainId),
-    createBlockRefRewriteMiddleware({ blockTracker }),
-    createBlockCacheMiddleware({ blockTracker }),
-    createInflightCacheMiddleware(),
-    createBlockTrackerInspectorMiddleware({ blockTracker }),
-    fetchMiddleware,
-  ]);
-
-  return { networkMiddleware, blockTracker };
-}
-
-function createChainIdMiddleware(chainId) {
-  return (req, res, next, end) => {
-    if (req.method === 'eth_chainId') {
-      res.result = chainId;
-      return end();
-    }
-    return next();
-  };
-}
-
-/**
- * For use in tests only.
- * Adds a delay to `eth_estimateGas` calls.
- */
-function createEstimateGasDelayTestMiddleware() {
-  return createAsyncMiddleware(async (req, _, next) => {
-    if (req.method === 'eth_estimateGas') {
-      await new Promise((resolve) => setTimeout(resolve, SECOND * 2));
-    }
-    return next();
-  });
-}
diff --git a/app/scripts/controllers/network/createJsonRpcClient.test.js b/app/scripts/controllers/network/createJsonRpcClient.test.js
deleted file mode 100644
index 1c3443d25..000000000
--- a/app/scripts/controllers/network/createJsonRpcClient.test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { testsForProviderType } from './provider-api-tests/shared-tests';
-
-describe('createJsonRpcClient', () => {
-  testsForProviderType('custom');
-});
diff --git a/app/scripts/controllers/network/network-controller.js b/app/scripts/controllers/network/network-controller.js
index 20869f227..06d236e26 100644
--- a/app/scripts/controllers/network/network-controller.js
+++ b/app/scripts/controllers/network/network-controller.js
@@ -1,8 +1,6 @@
 import { strict as assert } from 'assert';
 import EventEmitter from 'events';
 import { ComposedStore, ObservableStore } from '@metamask/obs-store';
-import { JsonRpcEngine } from 'json-rpc-engine';
-import { providerFromEngine } from '@metamask/eth-json-rpc-middleware';
 import log from 'loglevel';
 import {
   createSwappableProxy,
@@ -24,8 +22,7 @@ import {
   isSafeChainId,
 } from '../../../../shared/modules/network.utils';
 import { EVENT } from '../../../../shared/constants/metametrics';
-import createInfuraClient from './createInfuraClient';
-import createJsonRpcClient from './createJsonRpcClient';
+import { createNetworkClient } from './create-network-client';
 
 /**
  * @typedef {object} NetworkConfiguration
@@ -428,7 +425,10 @@ export default class NetworkController extends EventEmitter {
     // infura type-based endpoints
     const isInfura = INFURA_PROVIDER_TYPES.includes(type);
     if (isInfura) {
-      this._configureInfuraProvider(type, this._infuraProjectId);
+      this._configureInfuraProvider({
+        type,
+        infuraProjectId: this._infuraProjectId,
+      });
       // url-based rpc endpoints
     } else if (type === NETWORK_TYPES.RPC) {
       this._configureStandardProvider(rpcUrl, chainId);
@@ -439,25 +439,23 @@ export default class NetworkController extends EventEmitter {
     }
   }
 
-  _configureInfuraProvider(type, projectId) {
+  _configureInfuraProvider({ type, infuraProjectId }) {
     log.info('NetworkController - configureInfuraProvider', type);
-    const networkClient = createInfuraClient({
+    const { provider, blockTracker } = createNetworkClient({
       network: type,
-      projectId,
+      infuraProjectId,
+      type: 'infura',
     });
-    this._setNetworkClient(networkClient);
+    this._setProviderAndBlockTracker({ provider, blockTracker });
   }
 
   _configureStandardProvider(rpcUrl, chainId) {
     log.info('NetworkController - configureStandardProvider', rpcUrl);
-    const networkClient = createJsonRpcClient({ rpcUrl, chainId });
-    this._setNetworkClient(networkClient);
-  }
-
-  _setNetworkClient({ networkMiddleware, blockTracker }) {
-    const engine = new JsonRpcEngine();
-    engine.push(networkMiddleware);
-    const provider = providerFromEngine(engine);
+    const { provider, blockTracker } = createNetworkClient({
+      chainId,
+      rpcUrl,
+      type: 'custom',
+    });
     this._setProviderAndBlockTracker({ provider, blockTracker });
   }
 
diff --git a/app/scripts/controllers/network/network-controller.test.js b/app/scripts/controllers/network/network-controller.test.js
index a3743ae56..cd4e9a782 100644
--- a/app/scripts/controllers/network/network-controller.test.js
+++ b/app/scripts/controllers/network/network-controller.test.js
@@ -3,15 +3,15 @@ import { isMatch } from 'lodash';
 import { v4 } from 'uuid';
 import nock from 'nock';
 import sinon from 'sinon';
-import * as ethJsonRpcMiddlewareModule from '@metamask/eth-json-rpc-middleware';
+import * as ethJsonRpcProvider from '@metamask/eth-json-rpc-provider';
 import { BUILT_IN_NETWORKS } from '../../../../shared/constants/network';
 import { EVENT } from '../../../../shared/constants/metametrics';
 import NetworkController from './network-controller';
 
-jest.mock('@metamask/eth-json-rpc-middleware', () => {
+jest.mock('@metamask/eth-json-rpc-provider', () => {
   return {
     __esModule: true,
-    ...jest.requireActual('@metamask/eth-json-rpc-middleware'),
+    ...jest.requireActual('@metamask/eth-json-rpc-provider'),
   };
 });
 
@@ -1760,7 +1760,7 @@ describe('NetworkController', () => {
                   },
                 ];
                 jest
-                  .spyOn(ethJsonRpcMiddlewareModule, 'providerFromEngine')
+                  .spyOn(ethJsonRpcProvider, 'providerFromEngine')
                   .mockImplementationOnce(() => fakeProviders[0])
                   .mockImplementationOnce(() => fakeProviders[1]);
                 await withoutCallingLookupNetwork({
@@ -1876,7 +1876,7 @@ describe('NetworkController', () => {
                   },
                 ];
                 jest
-                  .spyOn(ethJsonRpcMiddlewareModule, 'providerFromEngine')
+                  .spyOn(ethJsonRpcProvider, 'providerFromEngine')
                   .mockImplementationOnce(() => fakeProviders[0])
                   .mockImplementationOnce(() => fakeProviders[1]);
                 await withoutCallingLookupNetwork({
diff --git a/app/scripts/controllers/network/provider-api-tests/helpers.js b/app/scripts/controllers/network/provider-api-tests/helpers.js
index a5d92b91e..afa91a7bb 100644
--- a/app/scripts/controllers/network/provider-api-tests/helpers.js
+++ b/app/scripts/controllers/network/provider-api-tests/helpers.js
@@ -1,10 +1,7 @@
 import nock from 'nock';
 import sinon from 'sinon';
-import { JsonRpcEngine } from 'json-rpc-engine';
-import { providerFromEngine } from '@metamask/eth-json-rpc-middleware';
 import EthQuery from 'eth-query';
-import createInfuraClient from '../createInfuraClient';
-import createJsonRpcClient from '../createJsonRpcClient';
+import { createNetworkClient } from '../create-network-client';
 
 /**
  * @typedef {import('nock').Scope} NockScope
@@ -414,20 +411,21 @@ export async function withNetworkClient(
   delete process.env.IN_TEST;
   const clientUnderTest =
     providerType === 'infura'
-      ? createInfuraClient({
+      ? createNetworkClient({
           network: infuraNetwork,
-          projectId: MOCK_INFURA_PROJECT_ID,
+          infuraProjectId: MOCK_INFURA_PROJECT_ID,
+          type: 'infura',
         })
-      : createJsonRpcClient({ rpcUrl: customRpcUrl, chainId: customChainId });
+      : createNetworkClient({
+          chainId: customChainId,
+          rpcUrl: customRpcUrl,
+          type: 'custom',
+        });
   process.env.IN_TEST = inTest;
 
-  const { networkMiddleware, blockTracker } = clientUnderTest;
+  const { provider, blockTracker } = clientUnderTest;
 
-  const engine = new JsonRpcEngine();
-  engine.push(networkMiddleware);
-  const provider = providerFromEngine(engine);
   const ethQuery = new EthQuery(provider);
-
   const curriedMakeRpcCall = (request) => makeRpcCall(ethQuery, request);
   const makeRpcCallsInSeries = async (requests) => {
     const responses = [];
diff --git a/app/scripts/controllers/network/provider-api-tests/shared-tests.js b/app/scripts/controllers/network/provider-api-tests/shared-tests.js
index d61595670..04412d3f0 100644
--- a/app/scripts/controllers/network/provider-api-tests/shared-tests.js
+++ b/app/scripts/controllers/network/provider-api-tests/shared-tests.js
@@ -291,9 +291,9 @@ export function testsForProviderType(providerType) {
         // tests on the core side.
 
         { name: 'net_listening', numberOfParameters: 0 },
-
-        { name: 'eth_subscribe', numberOfParameters: 1 },
-        { name: 'eth_unsubscribe', numberOfParameters: 1 },
+        // TODO: Methods to add back when we add testing for subscribe middleware
+        // { name: 'eth_subscribe', numberOfParameters: 1 },
+        // { name: 'eth_unsubscribe', numberOfParameters: 1 },
         { name: 'custom_rpc_method', numberOfParameters: 1 },
         { name: 'net_peerCount', numberOfParameters: 0 },
         { name: 'parity_nextNonce', numberOfParameters: 1 },
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 17687c27b..7d933f82d 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -871,8 +871,9 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": true,
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
+        "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -881,57 +882,19 @@
         "vinyl>clone": true
       }
     },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": true,
-        "ethereumjs-abi": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>rlp": true,
-        "ethereumjs-wallet>safe-buffer": true,
-        "ganache>secp256k1>elliptic": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
-      "packages": {
-        "browserify>buffer": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
-        "ethereumjs-wallet>randombytes": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
-      "packages": {
-        "browserify>buffer": true,
-        "ethjs>ethjs-util>is-hex-prefixed": true,
-        "ethjs>ethjs-util>strip-hex-prefix": true
-      }
-    },
     "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
-        "btoa": true,
         "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
+        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
-        "lavamoat>json-stable-stringify": true,
         "vinyl>clone": true
       }
     },
@@ -947,6 +910,12 @@
         "semver": true
       }
     },
+    "@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "json-rpc-engine": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
     "@metamask/eth-keyring-controller": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
@@ -2610,6 +2579,11 @@
         "document.createElement": true
       }
     },
+    "btoa": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "classnames": {
       "globals": {
         "classNames": "write",
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index ceadebd90..46ce15ef8 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -925,8 +925,9 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": true,
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
+        "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -935,57 +936,19 @@
         "vinyl>clone": true
       }
     },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": true,
-        "ethereumjs-abi": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>rlp": true,
-        "ethereumjs-wallet>safe-buffer": true,
-        "ganache>secp256k1>elliptic": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
-      "packages": {
-        "browserify>buffer": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
-        "ethereumjs-wallet>randombytes": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
-      "packages": {
-        "browserify>buffer": true,
-        "ethjs>ethjs-util>is-hex-prefixed": true,
-        "ethjs>ethjs-util>strip-hex-prefix": true
-      }
-    },
     "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
-        "btoa": true,
         "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
+        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
-        "lavamoat>json-stable-stringify": true,
         "vinyl>clone": true
       }
     },
@@ -1001,6 +964,12 @@
         "semver": true
       }
     },
+    "@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "json-rpc-engine": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
     "@metamask/eth-keyring-controller": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
@@ -3051,6 +3020,11 @@
         "document.createElement": true
       }
     },
+    "btoa": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "classnames": {
       "globals": {
         "classNames": "write",
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index ceadebd90..46ce15ef8 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -925,8 +925,9 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": true,
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
+        "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -935,57 +936,19 @@
         "vinyl>clone": true
       }
     },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": true,
-        "ethereumjs-abi": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>rlp": true,
-        "ethereumjs-wallet>safe-buffer": true,
-        "ganache>secp256k1>elliptic": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
-      "packages": {
-        "browserify>buffer": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
-        "ethereumjs-wallet>randombytes": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
-      "packages": {
-        "browserify>buffer": true,
-        "ethjs>ethjs-util>is-hex-prefixed": true,
-        "ethjs>ethjs-util>strip-hex-prefix": true
-      }
-    },
     "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
-        "btoa": true,
         "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
+        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
-        "lavamoat>json-stable-stringify": true,
         "vinyl>clone": true
       }
     },
@@ -1001,6 +964,12 @@
         "semver": true
       }
     },
+    "@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "json-rpc-engine": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
     "@metamask/eth-keyring-controller": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
@@ -3051,6 +3020,11 @@
         "document.createElement": true
       }
     },
+    "btoa": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "classnames": {
       "globals": {
         "classNames": "write",
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 17687c27b..7d933f82d 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -871,8 +871,9 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": true,
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
+        "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -881,57 +882,19 @@
         "vinyl>clone": true
       }
     },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": true,
-        "ethereumjs-abi": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util": {
-      "packages": {
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": true,
-        "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": true,
-        "bn.js": true,
-        "browserify>assert": true,
-        "browserify>buffer": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-util>rlp": true,
-        "ethereumjs-wallet>safe-buffer": true,
-        "ganache>secp256k1>elliptic": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethereum-cryptography": {
-      "packages": {
-        "browserify>buffer": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true,
-        "ethereumjs-util>ethereum-cryptography>secp256k1": true,
-        "ethereumjs-wallet>randombytes": true
-      }
-    },
-    "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>eth-sig-util>ethereumjs-util>ethjs-util": {
-      "packages": {
-        "browserify>buffer": true,
-        "ethjs>ethjs-util>is-hex-prefixed": true,
-        "ethjs>ethjs-util>strip-hex-prefix": true
-      }
-    },
     "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
-        "btoa": true,
         "console.error": true,
-        "fetch": true,
         "setTimeout": true
       },
       "packages": {
         "@metamask/eth-json-rpc-middleware>@metamask/utils": true,
         "@metamask/eth-json-rpc-middleware>pify": true,
+        "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
-        "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
-        "lavamoat>json-stable-stringify": true,
         "vinyl>clone": true
       }
     },
@@ -947,6 +910,12 @@
         "semver": true
       }
     },
+    "@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "json-rpc-engine": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
     "@metamask/eth-keyring-controller": {
       "packages": {
         "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true,
@@ -2610,6 +2579,11 @@
         "document.createElement": true
       }
     },
+    "btoa": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "classnames": {
       "globals": {
         "classNames": "write",
diff --git a/package.json b/package.json
index 6441e7a86..e76f1c517 100644
--- a/package.json
+++ b/package.json
@@ -232,8 +232,9 @@
     "@metamask/controller-utils": "^1.0.0",
     "@metamask/design-tokens": "^1.9.0",
     "@metamask/desktop": "^0.3.0",
-    "@metamask/eth-json-rpc-infura": "^7.0.0",
-    "@metamask/eth-json-rpc-middleware": "^10.0.0",
+    "@metamask/eth-json-rpc-infura": "^8.0.0",
+    "@metamask/eth-json-rpc-middleware": "^11.0.0",
+    "@metamask/eth-json-rpc-provider": "^1.0.0",
     "@metamask/eth-keyring-controller": "^10.0.1",
     "@metamask/eth-ledger-bridge-keyring": "^0.13.0",
     "@metamask/eth-token-tracker": "^4.0.0",
@@ -285,7 +286,7 @@
     "debounce-stream": "^2.0.0",
     "deep-freeze-strict": "1.1.1",
     "end-of-stream": "^1.4.4",
-    "eth-block-tracker": "^6.0.0",
+    "eth-block-tracker": "^7.0.0",
     "eth-ens-namehash": "^2.0.8",
     "eth-json-rpc-filters": "^6.0.0",
     "eth-lattice-keyring": "^0.12.3",
diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 16bafb208..077412623 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -1,4 +1,4 @@
-import { capitalize } from 'lodash';
+import { capitalize, pick } from 'lodash';
 /**
  * A type representing any valid value for 'type' for setProviderType and other
  * methods that add or manipulate networks in MetaMask state.
@@ -301,6 +301,13 @@ export const BUILT_IN_NETWORKS = {
   },
 } as const;
 
+export const BUILT_IN_INFURA_NETWORKS = pick(
+  BUILT_IN_NETWORKS,
+  INFURA_PROVIDER_TYPES,
+);
+
+export type BuiltInInfuraNetwork = keyof typeof BUILT_IN_INFURA_NETWORKS;
+
 export const NETWORK_TO_NAME_MAP = {
   [NETWORK_TYPES.MAINNET]: MAINNET_DISPLAY_NAME,
   [NETWORK_TYPES.GOERLI]: GOERLI_DISPLAY_NAME,
diff --git a/types/eth-json-rpc-filters/index.d.ts b/types/eth-json-rpc-filters/index.d.ts
new file mode 100644
index 000000000..f7515bccd
--- /dev/null
+++ b/types/eth-json-rpc-filters/index.d.ts
@@ -0,0 +1 @@
+declare module 'eth-json-rpc-filters';
diff --git a/types/eth-json-rpc-filters/subscriptionManager.d.ts b/types/eth-json-rpc-filters/subscriptionManager.d.ts
new file mode 100644
index 000000000..a79ff8ee4
--- /dev/null
+++ b/types/eth-json-rpc-filters/subscriptionManager.d.ts
@@ -0,0 +1 @@
+declare module 'eth-json-rpc-filters/subscriptionManager';
diff --git a/yarn.lock b/yarn.lock
index 6e98cfa41..6ea77ae8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3849,35 +3849,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-infura@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@metamask/eth-json-rpc-infura@npm:7.0.0"
+"@metamask/eth-json-rpc-infura@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@metamask/eth-json-rpc-infura@npm:8.0.0"
   dependencies:
     "@metamask/utils": ^3.0.1
-    eth-json-rpc-middleware: ^8.1.0
+    eth-json-rpc-middleware: ^9.0.0
     eth-rpc-errors: ^4.0.3
     json-rpc-engine: ^6.1.0
     node-fetch: ^2.6.7
-  checksum: 6230cb289b66db39d27f08ffc72cfb79274e632e4e14eb52ca72d19167d17bbf22c58718d80f801818058631dec0638bcc21ef4b229fa8d53e7f9328be870fc6
+  checksum: e8c3a4b75d4f2bb09f68d7d2ac6b992f264df893921b50a05c35968ee684b7bba90180870eebecfc89b7fbf40d11de2a545ab68f1d511f569ce0a6519c64b0aa
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-middleware@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@metamask/eth-json-rpc-middleware@npm:10.0.0"
+"@metamask/eth-json-rpc-middleware@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "@metamask/eth-json-rpc-middleware@npm:11.0.0"
   dependencies:
+    "@metamask/eth-json-rpc-provider": ^1.0.0
     "@metamask/eth-sig-util": ^5.0.0
-    "@metamask/safe-event-emitter": ^2.0.0
     "@metamask/utils": ^3.0.3
-    btoa: ^1.2.1
     clone: ^2.1.1
-    eth-block-tracker: ^5.0.1
+    eth-block-tracker: ^7.0.0
     eth-rpc-errors: ^4.0.3
     json-rpc-engine: ^6.1.0
-    json-stable-stringify: ^1.0.1
-    node-fetch: ^2.6.7
     pify: ^3.0.0
-  checksum: c754b3a39f175698070b4d07076e692d3080738bd25157c3b93114d286c975ee6895d5793b4188ca3d0abbcdef04bfde9e2d4835251a6b725b002d3750bf98de
+    safe-stable-stringify: ^2.3.2
+  checksum: c866d07a199ab480ceeb7ab8df61c08284640b5ac13aee3dd81dae9e0e5575f4a425d95728070ab5402c0c6cd5f9237fb5f4f22dbcdc99fe0b50bb47df561830
+  languageName: node
+  linkType: hard
+
+"@metamask/eth-json-rpc-provider@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/eth-json-rpc-provider@npm:1.0.0"
+  dependencies:
+    "@metamask/safe-event-emitter": ^2.0.0
+    json-rpc-engine: ^6.1.0
+  checksum: 27865d84d90030db1a9e5a66bc0b0ae079706fb7be635ec1e9bd4f64771e819aae78f0a026c6629d3a1a2eb277fcd51977315c049c47a70df1dd95d1d4106982
   languageName: node
   linkType: hard
 
@@ -15563,15 +15571,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eth-block-tracker@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "eth-block-tracker@npm:6.0.0"
+"eth-block-tracker@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "eth-block-tracker@npm:7.0.0"
   dependencies:
+    "@metamask/eth-json-rpc-provider": ^1.0.0
     "@metamask/safe-event-emitter": ^2.0.0
     "@metamask/utils": ^3.0.1
     json-rpc-random-id: ^1.0.1
     pify: ^3.0.0
-  checksum: ad1199b822a9a3ff2673ecc92ca7cda0a37828e5bfd1927fd917a8085a99904fc29d3ef2392068bcfb14e47589df097940ef28f3e9025d1681e56a89b07e284e
+  checksum: b76f6ba022947eec0161e5592bc5386e8f05bff8a2c3e0e10c76bce21bc51900ef1cb153eb8bf31858fb0027e929c6a85a159bdf84aa1e3ef77b24e53e82ba84
   languageName: node
   linkType: hard
 
@@ -15640,21 +15649,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eth-json-rpc-middleware@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "eth-json-rpc-middleware@npm:8.1.0"
+"eth-json-rpc-middleware@npm:^9.0.0":
+  version: 9.0.1
+  resolution: "eth-json-rpc-middleware@npm:9.0.1"
   dependencies:
+    "@metamask/eth-sig-util": ^5.0.0
     "@metamask/safe-event-emitter": ^2.0.0
+    "@metamask/utils": ^3.0.3
     btoa: ^1.2.1
     clone: ^2.1.1
     eth-block-tracker: ^5.0.1
     eth-rpc-errors: ^4.0.3
-    eth-sig-util: ^1.4.2
     json-rpc-engine: ^6.1.0
     json-stable-stringify: ^1.0.1
     node-fetch: ^2.6.7
     pify: ^3.0.0
-  checksum: ec10bbc04e3b7696f82db2db528b052c8f6de811c90a12d4eb32f23cbe6ea198d86656afa5b53c52de06b631fef633cf29409bb56c04a16f173da94ee1d89ab6
+  checksum: 9512829a6958df6ef739b891a0c0804b51a140407fd2e3ddaaa6b18d975796646cfcf7f7305a18beb7903db09e0c7a91b06dc5434b6bd2d6cdb85d992d9fd3ab
   languageName: node
   linkType: hard
 
@@ -24268,8 +24278,9 @@ __metadata:
     "@metamask/eslint-config-mocha": ^9.0.0
     "@metamask/eslint-config-nodejs": ^9.0.0
     "@metamask/eslint-config-typescript": ^9.0.1
-    "@metamask/eth-json-rpc-infura": ^7.0.0
-    "@metamask/eth-json-rpc-middleware": ^10.0.0
+    "@metamask/eth-json-rpc-infura": ^8.0.0
+    "@metamask/eth-json-rpc-middleware": ^11.0.0
+    "@metamask/eth-json-rpc-provider": ^1.0.0
     "@metamask/eth-keyring-controller": ^10.0.1
     "@metamask/eth-ledger-bridge-keyring": ^0.13.0
     "@metamask/eth-token-tracker": ^4.0.0
@@ -24402,7 +24413,7 @@ __metadata:
     eslint-plugin-react: ^7.23.1
     eslint-plugin-react-hooks: ^4.2.0
     eslint-plugin-storybook: ^0.6.4
-    eth-block-tracker: ^6.0.0
+    eth-block-tracker: ^7.0.0
     eth-ens-namehash: ^2.0.8
     eth-json-rpc-filters: ^6.0.0
     eth-lattice-keyring: ^0.12.3
@@ -30453,10 +30464,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-stable-stringify@npm:^2.1.0":
-  version: 2.3.1
-  resolution: "safe-stable-stringify@npm:2.3.1"
-  checksum: a0a0bad0294c3e2a9d1bf3cf2b1096dfb83c162d09a5e4891e488cce082120bd69161d2a92aae7fc48255290f17700decae9c89a07fe139794e61b5c8b411377
+"safe-stable-stringify@npm:^2.1.0, safe-stable-stringify@npm:^2.3.2":
+  version: 2.4.2
+  resolution: "safe-stable-stringify@npm:2.4.2"
+  checksum: 0324ba2e40f78cae63e31a02b1c9bdf1b786621f9e8760845608eb9e81aef401944ac2078e5c9c1533cf516aea34d08fa8052ca853637ced84b791caaf1e394e
   languageName: node
   linkType: hard
 

From 68f928c8a2de6ef6a5503381079e48f007600b0b Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Wed, 22 Mar 2023 17:17:19 -0700
Subject: [PATCH 052/129] Adding ModalContent component (#18175)

* Adding ModalContent component

* Using different component api for ref

* use imperative handle

* Updating size

* Updating stories and docs as well as component api

* Fixing import
---
 .../component-library-components.scss         |   1 +
 ui/components/component-library/index.js      |   1 +
 .../modal-content/README.mdx                  | 115 ++++++++++++++
 .../__snapshots__/modal-content.test.tsx.snap |  11 ++
 .../component-library/modal-content/index.ts  |   3 +
 .../modal-content/modal-content.scss          |  17 +++
 .../modal-content/modal-content.stories.tsx   | 144 ++++++++++++++++++
 .../modal-content/modal-content.test.tsx      |  39 +++++
 .../modal-content/modal-content.tsx           |  37 +++++
 .../modal-content/modal-content.types.ts      |  40 +++++
 10 files changed, 408 insertions(+)
 create mode 100644 ui/components/component-library/modal-content/README.mdx
 create mode 100644 ui/components/component-library/modal-content/__snapshots__/modal-content.test.tsx.snap
 create mode 100644 ui/components/component-library/modal-content/index.ts
 create mode 100644 ui/components/component-library/modal-content/modal-content.scss
 create mode 100644 ui/components/component-library/modal-content/modal-content.stories.tsx
 create mode 100644 ui/components/component-library/modal-content/modal-content.test.tsx
 create mode 100644 ui/components/component-library/modal-content/modal-content.tsx
 create mode 100644 ui/components/component-library/modal-content/modal-content.types.ts

diff --git a/ui/components/component-library/component-library-components.scss b/ui/components/component-library/component-library-components.scss
index 6a10d8f99..618b089ad 100644
--- a/ui/components/component-library/component-library-components.scss
+++ b/ui/components/component-library/component-library-components.scss
@@ -29,3 +29,4 @@
 @import 'form-text-field/form-text-field';
 @import 'banner-alert/banner-alert';
 @import 'banner-tip/banner-tip';
+@import 'modal-content/modal-content';
diff --git a/ui/components/component-library/index.js b/ui/components/component-library/index.js
index fbf0282f8..e1b2f1408 100644
--- a/ui/components/component-library/index.js
+++ b/ui/components/component-library/index.js
@@ -31,6 +31,7 @@ export { Text, TEXT_DIRECTIONS, INVISIBLE_CHARACTER } from './text';
 export { Input, INPUT_TYPES } from './input';
 export { TextField, TEXT_FIELD_TYPES, TEXT_FIELD_SIZES } from './text-field';
 export { TextFieldSearch } from './text-field-search';
+export { ModalContent, ModalContentSize } from './modal-content';
 
 // Molecules
 export { BannerBase } from './banner-base';
diff --git a/ui/components/component-library/modal-content/README.mdx b/ui/components/component-library/modal-content/README.mdx
new file mode 100644
index 000000000..3d755d954
--- /dev/null
+++ b/ui/components/component-library/modal-content/README.mdx
@@ -0,0 +1,115 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import { ModalContent } from './modal-content';
+
+# ModalContent
+
+`ModalContent` is the container for the modal dialog's content
+
+<Canvas>
+  <Story id="components-componentlibrary-modalcontent--default-story" />
+</Canvas>
+
+## Props
+
+The `ModalContent` accepts all props below as well as all [Box](/docs/components-ui-box--default-story#props) component props
+
+<ArgsTable of={ModalContent} />
+
+### Children
+
+Use the `children` prop to render the content of `ModalContent`
+
+<Canvas>
+  <Story id="components-componentlibrary-modalcontent--children" />
+</Canvas>
+
+```jsx
+import { ModalContent, Text } from '../../component-library';
+
+<ModalContent>
+  <ModalHeader />
+  <Text>
+    Lorem ipsum dolor sit amet consectetur adipisicing elit. Distinctio,
+    reiciendis assumenda dolorum mollitia saepe, optio at aliquam molestias
+    omnis quae corporis nesciunt natus, quas tempore ut ullam eaque fuga. Velit.
+  </Text>
+</ModalContent>;
+```
+
+### Size
+
+Currently the `ModalContent` supports a single size, this decision was made after we ran an audit on all modal sizes in the extension codebase and found that all modals could be made to fit the `ModalContentSize.Sm`(360px) size.
+
+If you do require a larger modal size you can use the Box props or add a className to override the default size.
+
+<Canvas>
+  <Story id="components-componentlibrary-modalcontent--size" />
+</Canvas>
+
+```jsx
+import { BLOCK_SIZES } from '../../../helpers/constants/design-system';
+import { ModalContent,s Text } from '../../component-library';
+
+<ModalContent {...args} marginBottom={4}>
+  <Text>ModalContentSize.Sm default and only size 360px max-width</Text>
+</ModalContent>
+<ModalContent
+  {...args}
+  width={[
+    BLOCK_SIZES.FULL,
+    BLOCK_SIZES.THREE_FOURTHS,
+    BLOCK_SIZES.HALF,
+    BLOCK_SIZES.ONE_THIRD,
+  ]}
+  marginBottom={4}
+>
+  <Text>
+    Using width Box props and responsive array props <br /> [
+    BLOCK_SIZES.FULL, BLOCK_SIZES.THREE_FOURTHS, BLOCK_SIZES.HALF,
+    BLOCK_SIZES.ONE_THIRD, ]
+  </Text>
+</ModalContent>
+<ModalContent {...args} marginBottom={4} style={{ maxWidth: 800 }}>
+  Adding a className and setting a max width (max-width: 800px)
+</ModalContent>
+```
+
+### Modal Content Ref
+
+Use the `modalContentRef` prop to pass a ref to the `ModalContent` component. This is primarily used with the `closeOnOutsideClick` prop on the `Modal` component. It allows the `Modal` to close when the user clicks outside of the `ModalContent` component.
+
+<Canvas>
+  <Story id="components-componentlibrary-modalcontent--modal-content-ref" />
+</Canvas>
+
+```jsx
+import React, { useEffect, useRef, useState } from 'react';
+import { ModalContent, Text } from '../../component-library';
+
+const [show, setShow] = useState(false);
+const modalContentRef = useRef<HTMLDivElement>(null);
+
+const handleClickOutside = (event: MouseEvent) => {
+  if (
+    modalContentRef?.current &&
+    !modalContentRef.current.contains(event.target as Node)
+  ) {
+    setShow(false);
+  }
+};
+
+useEffect(() => {
+  document.addEventListener('mousedown', handleClickOutside);
+  return () => {
+    document.removeEventListener('mousedown', handleClickOutside);
+  };
+}, []);
+
+<Button onClick={() => setShow(true)}>Show ModalContent</Button>
+{show && (
+  <ModalContent modalContentRef={modalContentRef}>
+    Click outside of this ModalContent to close
+  </ModalContent>
+)}
+```
diff --git a/ui/components/component-library/modal-content/__snapshots__/modal-content.test.tsx.snap b/ui/components/component-library/modal-content/__snapshots__/modal-content.test.tsx.snap
new file mode 100644
index 000000000..c8fa28c96
--- /dev/null
+++ b/ui/components/component-library/modal-content/__snapshots__/modal-content.test.tsx.snap
@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ModalContent should match snapshot 1`] = `
+<div>
+  <div
+    class="box mm-modal-content mm-modal-content--size-sm box--padding-4 box--flex-direction-row box--width-full box--background-color-background-default box--rounded-lg"
+  >
+    test
+  </div>
+</div>
+`;
diff --git a/ui/components/component-library/modal-content/index.ts b/ui/components/component-library/modal-content/index.ts
new file mode 100644
index 000000000..ef6fb6595
--- /dev/null
+++ b/ui/components/component-library/modal-content/index.ts
@@ -0,0 +1,3 @@
+export { ModalContent } from './modal-content';
+export { ModalContentSize } from './modal-content.types';
+export type { ModalContentProps } from './modal-content.types';
diff --git a/ui/components/component-library/modal-content/modal-content.scss b/ui/components/component-library/modal-content/modal-content.scss
new file mode 100644
index 000000000..3c3bc00fb
--- /dev/null
+++ b/ui/components/component-library/modal-content/modal-content.scss
@@ -0,0 +1,17 @@
+.mm-modal-content {
+  --modal-content-size: var(--size, 360px);
+
+  // Currently there is only use case for one size of ModalContent in the extension
+  // See audit https://www.figma.com/file/hxYqloYgmVcgsoiVqmGZ8K/Modal-Audit?node-id=481%3A244&t=XITeuRB1pRc09hiG-1
+  // Not to say there won't be more in the future, but to prevent redundant code there is only one for now
+  &--size-sm {
+    --size: 360px;
+
+    max-width: var(--modal-content-size);
+  }
+
+  position: relative;
+  box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
+  max-height: calc(100% - 32px); // allow for 16px padding on top and bottom
+  overflow: auto;
+}
diff --git a/ui/components/component-library/modal-content/modal-content.stories.tsx b/ui/components/component-library/modal-content/modal-content.stories.tsx
new file mode 100644
index 000000000..020e17026
--- /dev/null
+++ b/ui/components/component-library/modal-content/modal-content.stories.tsx
@@ -0,0 +1,144 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+
+import {
+  DISPLAY,
+  JustifyContent,
+  AlignItems,
+  BLOCK_SIZES,
+  TextVariant,
+  TEXT_ALIGN,
+} from '../../../helpers/constants/design-system';
+
+import Box from '../../ui/box';
+
+import { Button, Text } from '..';
+
+import { ModalContent } from './modal-content';
+import { ModalContentSize } from './modal-content.types';
+
+import README from './README.mdx';
+
+export default {
+  title: 'Components/ComponentLibrary/ModalContent',
+  component: ModalContent,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    className: {
+      control: 'text',
+    },
+    children: {
+      control: 'text',
+    },
+    size: {
+      control: 'select',
+      options: Object.values(ModalContentSize).map((value) =>
+        value.toLowerCase(),
+      ),
+    },
+  },
+  args: {
+    children: 'Modal Content',
+  },
+} as ComponentMeta<typeof ModalContent>;
+
+const Template: ComponentStory<typeof ModalContent> = (args) => (
+  <ModalContent {...args} />
+);
+
+export const DefaultStory = Template.bind({});
+DefaultStory.storyName = 'Default';
+
+/*
+ * !!TODO: Replace with ModalHeader component
+ */
+const ModalHeader = () => (
+  <>
+    <Box
+      className="mm-modal-header"
+      display={DISPLAY.FLEX}
+      justifyContent={JustifyContent.spaceBetween}
+      alignItems={AlignItems.flexStart}
+      width={BLOCK_SIZES.FULL}
+      marginBottom={4}
+    >
+      <button>Back</button>
+      <Text variant={TextVariant.headingSm} textAlign={TEXT_ALIGN.CENTER}>
+        Modal Header
+      </Text>
+      <button>Close</button>
+    </Box>
+  </>
+);
+
+export const Children: ComponentStory<typeof ModalContent> = (args) => (
+  <ModalContent {...args}>
+    <ModalHeader />
+    <Text>
+      Lorem ipsum dolor sit amet consectetur adipisicing elit. Distinctio,
+      reiciendis assumenda dolorum mollitia saepe, optio at aliquam molestias
+      omnis quae corporis nesciunt natus, quas tempore ut ullam eaque fuga.
+      Velit.
+    </Text>
+  </ModalContent>
+);
+
+export const Size: ComponentStory<typeof ModalContent> = (args) => (
+  <>
+    <ModalContent {...args} marginBottom={4}>
+      <Text>ModalContentSize.Sm default and only size 360px max-width</Text>
+    </ModalContent>
+    <ModalContent
+      {...args}
+      width={[
+        BLOCK_SIZES.FULL,
+        BLOCK_SIZES.THREE_FOURTHS,
+        BLOCK_SIZES.HALF,
+        BLOCK_SIZES.ONE_THIRD,
+      ]}
+      marginBottom={4}
+    >
+      <Text>
+        Using width Box props and responsive array props <br /> [
+        BLOCK_SIZES.FULL, BLOCK_SIZES.THREE_FOURTHS, BLOCK_SIZES.HALF,
+        BLOCK_SIZES.ONE_THIRD, ]
+      </Text>
+    </ModalContent>
+    <ModalContent {...args} marginBottom={4} style={{ maxWidth: 800 }}>
+      Adding a className and setting a max width (max-width: 800px)
+    </ModalContent>
+  </>
+);
+
+export const ModalContentRef: ComponentStory<typeof ModalContent> = (args) => {
+  const [show, setShow] = useState(false);
+  const modalContentRef = useRef<HTMLDivElement>(null);
+  const handleClickOutside = (event: MouseEvent) => {
+    if (
+      modalContentRef?.current &&
+      !modalContentRef.current.contains(event.target as Node)
+    ) {
+      setShow(false);
+    }
+  };
+  useEffect(() => {
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, []);
+  return (
+    <>
+      <Button onClick={() => setShow(true)}>Show ModalContent</Button>
+      {show && (
+        <ModalContent {...args} modalContentRef={modalContentRef}>
+          Click outside of this ModalContent to close
+        </ModalContent>
+      )}
+    </>
+  );
+};
diff --git a/ui/components/component-library/modal-content/modal-content.test.tsx b/ui/components/component-library/modal-content/modal-content.test.tsx
new file mode 100644
index 000000000..64b6a96df
--- /dev/null
+++ b/ui/components/component-library/modal-content/modal-content.test.tsx
@@ -0,0 +1,39 @@
+/* eslint-disable jest/require-top-level-describe */
+import { render } from '@testing-library/react';
+import React from 'react';
+
+import { ModalContent } from './modal-content';
+import { ModalContentSize } from './modal-content.types';
+
+describe('ModalContent', () => {
+  it('should render with text inside the ModalContent', () => {
+    const { getByText } = render(<ModalContent>test</ModalContent>);
+    expect(getByText('test')).toBeDefined();
+    expect(getByText('test')).toHaveClass('mm-modal-content');
+  });
+  it('should match snapshot', () => {
+    const { container } = render(<ModalContent>test</ModalContent>);
+    expect(container).toMatchSnapshot();
+  });
+  it('should render with and additional className', () => {
+    const { getByText } = render(
+      <ModalContent className="test-class">test</ModalContent>,
+    );
+    expect(getByText('test')).toHaveClass('test-class');
+  });
+  it('should render with size sm', () => {
+    const { getByText } = render(
+      <>
+        <ModalContent>default</ModalContent>
+        <ModalContent size={ModalContentSize.Sm}>sm</ModalContent>
+      </>,
+    );
+    expect(getByText('sm')).toHaveClass('mm-modal-content--size-sm');
+    expect(getByText('default')).toHaveClass('mm-modal-content--size-sm');
+  });
+  it('should render with a ref', () => {
+    const ref = React.createRef<HTMLDivElement>();
+    render(<ModalContent modalContentRef={ref}>test</ModalContent>);
+    expect(ref.current).toBeDefined();
+  });
+});
diff --git a/ui/components/component-library/modal-content/modal-content.tsx b/ui/components/component-library/modal-content/modal-content.tsx
new file mode 100644
index 000000000..064a4b4e7
--- /dev/null
+++ b/ui/components/component-library/modal-content/modal-content.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import classnames from 'classnames';
+
+import {
+  BackgroundColor,
+  BorderRadius,
+  BLOCK_SIZES,
+} from '../../../helpers/constants/design-system';
+
+import Box from '../../ui/box/box';
+
+import { ModalContentProps, ModalContentSize } from './modal-content.types';
+
+export const ModalContent = ({
+  className = '',
+  children,
+  size = ModalContentSize.Sm,
+  width,
+  modalContentRef, // Would have preferred to forwardRef but it's not trivial in TypeScript. Will update once we have an established pattern
+  ...props
+}: ModalContentProps) => (
+  <Box
+    className={classnames(
+      'mm-modal-content',
+      { [`mm-modal-content--size-${size}`]: !width },
+      className,
+    )}
+    backgroundColor={BackgroundColor.backgroundDefault}
+    borderRadius={BorderRadius.LG}
+    width={width || BLOCK_SIZES.FULL}
+    padding={4}
+    ref={modalContentRef}
+    {...props}
+  >
+    {children}
+  </Box>
+);
diff --git a/ui/components/component-library/modal-content/modal-content.types.ts b/ui/components/component-library/modal-content/modal-content.types.ts
new file mode 100644
index 000000000..801a04b36
--- /dev/null
+++ b/ui/components/component-library/modal-content/modal-content.types.ts
@@ -0,0 +1,40 @@
+import React from 'react';
+import type { BoxProps, BoxWidth, BoxWidthArray } from '../../ui/box/box.d';
+import { Size } from '../../../helpers/constants/design-system';
+
+/*
+ * ModalContent sizes
+ * Currently there is only use case for one size of ModalContent in the extension
+ * See audit https://www.figma.com/file/hxYqloYgmVcgsoiVqmGZ8K/Modal-Audit?node-id=481%3A244&t=XITeuRB1pRc09hiG-1
+ * Not to say there won't be more in the future, but to prevent redundant code there is only one for now
+ */
+export enum ModalContentSize {
+  Sm = Size.SM,
+}
+
+export interface ModalContentProps extends BoxProps {
+  /**
+   * The additional className of the ModalContent component
+   */
+  className?: string;
+  /**
+   * The content of the ModalContent component
+   */
+  children?: React.ReactNode;
+  /**
+   * The size of ModalContent
+   * Currently only one size is supported ModalContentSize.Sm 360px
+   * See docs for more info
+   */
+  size?: ModalContentSize;
+  /**
+   * To override the default width of the ModalContent component
+   * Accepts all BLOCK_SIZES from design-system
+   */
+  width?: BoxWidth | BoxWidthArray;
+  /**
+   * The ref of the ModalContent component
+   * Used with Modal and closeOnOutsideClick prop
+   */
+  modalContentRef?: React.RefObject<HTMLElement>;
+}

From fcfb8a8938a310a4f68b0e5a3175535e8dc9ed91 Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Thu, 23 Mar 2023 15:38:33 +0530
Subject: [PATCH 053/129] UX: Multichain: Added TokenList Component  (#17859)

* added redesign storybook

* updated token list

* updated css

* fixed lint error

* updated the new token list component

* fixed redesign folder error

* reverted changes in settings.json

* updated redesign to multichain

* added feature flag

* reverted settings.json

* added detect token banner

* added button componeny

* fixed lint errors

* removed settings

* fixed lint errors

* added stories for multichain

* updated no token found string

* updated lint error

* updated padding values

* updated padding values

* updated tabs with role button

* updated hover state

* updated components with multichain

* fixed lint errors

* updated multichain import token link

* updated a tag

* updated fixes

* updated onClick to handleClick

* updated setShowDetectedTokens proptype

* updated multichain tokenlist with item suffix

* updated tests

* updated tests

* updated token list css

* updated snapshot

* updated text

* reverted story

* added story for multichain token list

* updated story

* updated tooltip

* updated the new token list component

* fixed redesign folder error

* added feature flag

* reverted unused setting change

* removed token list

* fixed lint error

* updated status

* updated tooltip

* updated token-list-item changes

* updated actionbutton click for detect token banner

* updated snapshot

* updated symbol

* updated styles

* updated eth decimal and token url

* updated snapshot

* updated scripts

* updated snapshots
---
 ui/components/app/asset-list/asset-list.js    |  94 +++++++---
 ui/components/app/token-cell/token-cell.js    |  70 +++++---
 .../detected-token-banner.test.js.snap        |  27 +++
 .../detected-token-banner.js                  |  60 +++++++
 .../detected-token-banner.stories.js          |  14 ++
 .../detected-token-banner.test.js             |  39 +++++
 .../multichain/detected-token-banner/index.js |   1 +
 ui/components/multichain/index.js             |   3 +
 ui/components/multichain/index.scss           |   2 -
 .../multichain/multichain-components.scss     |   9 +
 .../multichain-import-token-link.test.js.snap |  75 ++++++++
 .../multichain-import-token-link/index.js     |   1 +
 .../multichain-import-token-link.js           |  87 ++++++++++
 .../multichain-import-token-link.stories.js   |  11 ++
 .../multichain-import-token-link.test.js      | 101 +++++++++++
 .../multichain-token-list-item.test.js.snap   |  67 ++++++++
 .../multichain-token-list-item/index.js       |   1 +
 .../multichain-token-list-item.js             | 162 ++++++++++++++++++
 .../multichain-token-list-item.scss           |   8 +
 .../multichain-token-list-item.stories.js     |  78 +++++++++
 .../multichain-token-list-item.test.js        |  57 ++++++
 ui/components/ui/tooltip/index.scss           |   8 +-
 ui/css/index.scss                             |   2 +-
 23 files changed, 919 insertions(+), 58 deletions(-)
 create mode 100644 ui/components/multichain/detected-token-banner/__snapshots__/detected-token-banner.test.js.snap
 create mode 100644 ui/components/multichain/detected-token-banner/detected-token-banner.js
 create mode 100644 ui/components/multichain/detected-token-banner/detected-token-banner.stories.js
 create mode 100644 ui/components/multichain/detected-token-banner/detected-token-banner.test.js
 create mode 100644 ui/components/multichain/detected-token-banner/index.js
 delete mode 100644 ui/components/multichain/index.scss
 create mode 100644 ui/components/multichain/multichain-components.scss
 create mode 100644 ui/components/multichain/multichain-import-token-link/__snapshots__/multichain-import-token-link.test.js.snap
 create mode 100644 ui/components/multichain/multichain-import-token-link/index.js
 create mode 100644 ui/components/multichain/multichain-import-token-link/multichain-import-token-link.js
 create mode 100644 ui/components/multichain/multichain-import-token-link/multichain-import-token-link.stories.js
 create mode 100644 ui/components/multichain/multichain-import-token-link/multichain-import-token-link.test.js
 create mode 100644 ui/components/multichain/multichain-token-list-item/__snapshots__/multichain-token-list-item.test.js.snap
 create mode 100644 ui/components/multichain/multichain-token-list-item/index.js
 create mode 100644 ui/components/multichain/multichain-token-list-item/multichain-token-list-item.js
 create mode 100644 ui/components/multichain/multichain-token-list-item/multichain-token-list-item.scss
 create mode 100644 ui/components/multichain/multichain-token-list-item/multichain-token-list-item.stories.js
 create mode 100644 ui/components/multichain/multichain-token-list-item/multichain-token-list-item.test.js

diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js
index 427e60690..e83606e8b 100644
--- a/ui/components/app/asset-list/asset-list.js
+++ b/ui/components/app/asset-list/asset-list.js
@@ -12,21 +12,26 @@ import {
   getNativeCurrencyImage,
   getDetectedTokensInCurrentNetwork,
   getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
+  getTokenList,
 } from '../../../selectors';
 import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay';
-import Typography from '../../ui/typography/typography';
 import Box from '../../ui/box/box';
 import {
   Color,
-  TypographyVariant,
-  FONT_WEIGHT,
-  JustifyContent,
+  TextVariant,
+  TEXT_ALIGN,
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
 import DetectedToken from '../detected-token/detected-token';
+import {
+  DetectedTokensBanner,
+  MultichainTokenListItem,
+  MultichainImportTokenLink,
+} from '../../multichain';
+import { Text } from '../../component-library';
 import DetectedTokensLink from './detetcted-tokens-link/detected-tokens-link';
 
 const AssetList = ({ onClickAsset }) => {
@@ -69,20 +74,38 @@ const AssetList = ({ onClickAsset }) => {
   const istokenDetectionInactiveOnNonMainnetSupportedNetwork = useSelector(
     getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
   );
-
+  const tokenList = useSelector(getTokenList);
+  const tokenData = Object.values(tokenList).find(
+    (token) => token.symbol === primaryCurrencyProperties.suffix,
+  );
+  const title = tokenData?.name || primaryCurrencyProperties.suffix;
   return (
     <>
-      <AssetListItem
-        onClick={() => onClickAsset(nativeCurrency)}
-        data-testid="wallet-balance"
-        primary={
-          primaryCurrencyProperties.value ?? secondaryCurrencyProperties.value
-        }
-        tokenSymbol={primaryCurrencyProperties.suffix}
-        secondary={showFiat ? secondaryCurrencyDisplay : undefined}
-        tokenImage={balanceIsLoading ? null : primaryTokenImage}
-        identiconBorder
-      />
+      {process.env.MULTICHAIN ? (
+        <MultichainTokenListItem
+          onClick={() => onClickAsset(nativeCurrency)}
+          title={title}
+          primary={
+            primaryCurrencyProperties.value ?? secondaryCurrencyProperties.value
+          }
+          tokenSymbol={primaryCurrencyProperties.suffix}
+          secondary={showFiat ? secondaryCurrencyDisplay : undefined}
+          tokenImage={balanceIsLoading ? null : primaryTokenImage}
+        />
+      ) : (
+        <AssetListItem
+          onClick={() => onClickAsset(nativeCurrency)}
+          data-testid="wallet-balance"
+          primary={
+            primaryCurrencyProperties.value ?? secondaryCurrencyProperties.value
+          }
+          tokenSymbol={primaryCurrencyProperties.suffix}
+          secondary={showFiat ? secondaryCurrencyDisplay : undefined}
+          tokenImage={balanceIsLoading ? null : primaryTokenImage}
+          identiconBorder
+        />
+      )}
+
       <TokenList
         onTokenClick={(tokenAddress) => {
           onClickAsset(tokenAddress);
@@ -98,19 +121,36 @@ const AssetList = ({ onClickAsset }) => {
       />
       {detectedTokens.length > 0 &&
         !istokenDetectionInactiveOnNonMainnetSupportedNetwork && (
-          <DetectedTokensLink setShowDetectedTokens={setShowDetectedTokens} />
+          <>
+            {process.env.MULTICHAIN ? (
+              <DetectedTokensBanner
+                actionButtonOnClick={() => setShowDetectedTokens(true)}
+                margin={4}
+              />
+            ) : (
+              <DetectedTokensLink
+                setShowDetectedTokens={setShowDetectedTokens}
+              />
+            )}
+          </>
         )}
       <Box marginTop={detectedTokens.length > 0 ? 0 : 4}>
-        <Box justifyContent={JustifyContent.center}>
-          <Typography
-            color={Color.textAlternative}
-            variant={TypographyVariant.H6}
-            fontWeight={FONT_WEIGHT.NORMAL}
-          >
-            {t('missingToken')}
-          </Typography>
-        </Box>
-        <ImportTokenLink />
+        {process.env.MULTICHAIN ? (
+          <MultichainImportTokenLink margin={4} />
+        ) : (
+          <>
+            <Text
+              color={Color.textAlternative}
+              variant={TextVariant.bodySm}
+              as="h6"
+              textAlign={TEXT_ALIGN.CENTER}
+            >
+              {t('missingToken')}
+            </Text>
+
+            <ImportTokenLink />
+          </>
+        )}
       </Box>
       {showDetectedTokens && (
         <DetectedToken setShowDetectedTokens={setShowDetectedTokens} />
diff --git a/ui/components/app/token-cell/token-cell.js b/ui/components/app/token-cell/token-cell.js
index 1a18f9c83..60d8f304a 100644
--- a/ui/components/app/token-cell/token-cell.js
+++ b/ui/components/app/token-cell/token-cell.js
@@ -3,9 +3,12 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { useSelector } from 'react-redux';
 import AssetListItem from '../asset-list-item';
-import { getSelectedAddress } from '../../../selectors';
+import { getSelectedAddress, getTokenList } from '../../../selectors';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
+import { MultichainTokenListItem } from '../../multichain';
+import { ButtonLink, Text } from '../../component-library';
+import { TextColor } from '../../../helpers/constants/design-system';
 
 export default function TokenCell({
   address,
@@ -19,39 +22,58 @@ export default function TokenCell({
 }) {
   const userAddress = useSelector(getSelectedAddress);
   const t = useI18nContext();
-
+  const tokenList = useSelector(getTokenList);
+  const tokenData = Object.values(tokenList).find(
+    (token) => token.symbol === symbol,
+  );
+  const title = tokenData?.name || symbol;
+  const tokenImage = tokenData?.iconUrl || image;
   const formattedFiat = useTokenFiatAmount(address, string, symbol);
   const warning = balanceError ? (
-    <span>
+    <Text as="span">
       {t('troubleTokenBalances')}
-      <a
+      <ButtonLink
         href={`https://ethplorer.io/address/${userAddress}`}
-        rel="noopener noreferrer"
-        target="_blank"
+        externalLink
         onClick={(event) => event.stopPropagation()}
-        style={{ color: 'var(--color-warning-default)' }}
+        textProps={{
+          color: TextColor.warningDefault,
+        }}
       >
         {t('here')}
-      </a>
-    </span>
+      </ButtonLink>
+    </Text>
   ) : null;
 
   return (
-    <AssetListItem
-      className={classnames('token-cell', {
-        'token-cell--outdated': Boolean(balanceError),
-      })}
-      iconClassName="token-cell__icon"
-      onClick={onClick.bind(null, address)}
-      tokenAddress={address}
-      tokenSymbol={symbol}
-      tokenDecimals={decimals}
-      tokenImage={image}
-      warning={warning}
-      primary={`${string || 0}`}
-      secondary={formattedFiat}
-      isERC721={isERC721}
-    />
+    <>
+      {process.env.MULTICHAIN ? (
+        <MultichainTokenListItem
+          onClick={() => onClick(address)}
+          tokenSymbol={symbol}
+          tokenImage={tokenImage}
+          primary={`${string || 0}`}
+          secondary={formattedFiat}
+          title={title}
+        />
+      ) : (
+        <AssetListItem
+          className={classnames('token-cell', {
+            'token-cell--outdated': Boolean(balanceError),
+          })}
+          iconClassName="token-cell__icon"
+          onClick={() => onClick(address)}
+          tokenAddress={address}
+          tokenSymbol={symbol}
+          tokenDecimals={decimals}
+          tokenImage={image}
+          warning={warning}
+          primary={`${string || 0}`}
+          secondary={formattedFiat}
+          isERC721={isERC721}
+        />
+      )}
+    </>
   );
 }
 
diff --git a/ui/components/multichain/detected-token-banner/__snapshots__/detected-token-banner.test.js.snap b/ui/components/multichain/detected-token-banner/__snapshots__/detected-token-banner.test.js.snap
new file mode 100644
index 000000000..cbf587cb2
--- /dev/null
+++ b/ui/components/multichain/detected-token-banner/__snapshots__/detected-token-banner.test.js.snap
@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DetectedTokensBanner should render correctly 1`] = `
+<div>
+  <div
+    class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-info multichain-detected-token-banner box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-primary-muted box--rounded-sm"
+    data-testid="detected-token-banner"
+  >
+    <span
+      class="box mm-icon mm-icon--size-lg box--display-inline-block box--flex-direction-row box--color-primary-default"
+      style="mask-image: url('./images/icons/info.svg');"
+    />
+    <div>
+      <p
+        class="box mm-text mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+      >
+        3 new tokens found in this account
+      </p>
+      <button
+        class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+      >
+        Import tokens
+      </button>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/multichain/detected-token-banner/detected-token-banner.js b/ui/components/multichain/detected-token-banner/detected-token-banner.js
new file mode 100644
index 000000000..790630ef7
--- /dev/null
+++ b/ui/components/multichain/detected-token-banner/detected-token-banner.js
@@ -0,0 +1,60 @@
+import React, { useContext } from 'react';
+import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { getDetectedTokensInCurrentNetwork } from '../../../selectors';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import { BannerAlert } from '../../component-library';
+
+export const DetectedTokensBanner = ({
+  className,
+  actionButtonOnClick,
+  ...props
+}) => {
+  const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
+
+  const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork);
+  const detectedTokensDetails = detectedTokens.map(
+    ({ address, symbol }) => `${symbol} - ${address}`,
+  );
+
+  const handleOnClick = () => {
+    actionButtonOnClick();
+    trackEvent({
+      event: EVENT_NAMES.TOKEN_IMPORT_CLICKED,
+      category: EVENT.CATEGORIES.WALLET,
+      properties: {
+        source: EVENT.SOURCE.TOKEN.DETECTED,
+        tokens: detectedTokensDetails,
+      },
+    });
+  };
+  return (
+    <BannerAlert
+      className={classNames('multichain-detected-token-banner', className)}
+      actionButtonLabel={t('importTokensCamelCase')}
+      actionButtonOnClick={handleOnClick}
+      data-testid="detected-token-banner"
+      {...props}
+    >
+      {detectedTokens.length === 1
+        ? t('numberOfNewTokensDetectedSingular')
+        : t('numberOfNewTokensDetectedPlural', [detectedTokens.length])}
+    </BannerAlert>
+  );
+};
+
+DetectedTokensBanner.propTypes = {
+  /**
+   * Handler to be passed to the DetectedTokenBanner component
+   */
+  actionButtonOnClick: PropTypes.func.isRequired,
+  /**
+   * An additional className to the DetectedTokenBanner component
+   */
+  className: PropTypes.string,
+};
diff --git a/ui/components/multichain/detected-token-banner/detected-token-banner.stories.js b/ui/components/multichain/detected-token-banner/detected-token-banner.stories.js
new file mode 100644
index 000000000..080b476ef
--- /dev/null
+++ b/ui/components/multichain/detected-token-banner/detected-token-banner.stories.js
@@ -0,0 +1,14 @@
+import React from 'react';
+import { DetectedTokensBanner } from './detected-token-banner';
+
+export default {
+  title: 'Components/Multichain/DetectedTokensBanner',
+  component: DetectedTokensBanner,
+  argTypes: {
+    actionButtonOnClick: { action: 'setShowDetectedTokens' },
+  },
+};
+
+export const DefaultStory = (args) => <DetectedTokensBanner {...args} />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/multichain/detected-token-banner/detected-token-banner.test.js b/ui/components/multichain/detected-token-banner/detected-token-banner.test.js
new file mode 100644
index 000000000..e7c78b47b
--- /dev/null
+++ b/ui/components/multichain/detected-token-banner/detected-token-banner.test.js
@@ -0,0 +1,39 @@
+import React from 'react';
+import { renderWithProvider, screen, fireEvent } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import testData from '../../../../.storybook/test-data';
+
+import { DetectedTokensBanner } from './detected-token-banner';
+
+describe('DetectedTokensBanner', () => {
+  let setShowDetectedTokensSpy;
+
+  const args = {};
+
+  beforeEach(() => {
+    setShowDetectedTokensSpy = jest.fn();
+    args.actionButtonOnClick = setShowDetectedTokensSpy;
+  });
+
+  it('should render correctly', () => {
+    const store = configureStore(testData);
+    const { getByTestId, container } = renderWithProvider(
+      <DetectedTokensBanner {...args} />,
+      store,
+    );
+
+    expect(getByTestId('detected-token-banner')).toBeDefined();
+    expect(container).toMatchSnapshot();
+  });
+  it('should render number of tokens detected link', () => {
+    const store = configureStore(testData);
+    renderWithProvider(<DetectedTokensBanner {...args} />, store);
+
+    expect(
+      screen.getByText('3 new tokens found in this account'),
+    ).toBeInTheDocument();
+
+    fireEvent.click(screen.getByText('Import tokens'));
+    expect(setShowDetectedTokensSpy).toHaveBeenCalled();
+  });
+});
diff --git a/ui/components/multichain/detected-token-banner/index.js b/ui/components/multichain/detected-token-banner/index.js
new file mode 100644
index 000000000..0fe2b61de
--- /dev/null
+++ b/ui/components/multichain/detected-token-banner/index.js
@@ -0,0 +1 @@
+export { DetectedTokensBanner } from './detected-token-banner';
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
index 49c3563e4..d34e42751 100644
--- a/ui/components/multichain/index.js
+++ b/ui/components/multichain/index.js
@@ -1,3 +1,6 @@
 export { AccountListItem } from './account-list-item';
 export { AccountListItemMenu } from './account-list-item-menu';
 export { AccountListMenu } from './account-list-menu';
+export { DetectedTokensBanner } from './detected-token-banner';
+export { MultichainImportTokenLink } from './multichain-import-token-link';
+export { MultichainTokenListItem } from './multichain-token-list-item';
diff --git a/ui/components/multichain/index.scss b/ui/components/multichain/index.scss
deleted file mode 100644
index bef86b1dd..000000000
--- a/ui/components/multichain/index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import 'account-list-item/index';
-@import 'account-list-menu/index';
diff --git a/ui/components/multichain/multichain-components.scss b/ui/components/multichain/multichain-components.scss
new file mode 100644
index 000000000..e8ee40ffa
--- /dev/null
+++ b/ui/components/multichain/multichain-components.scss
@@ -0,0 +1,9 @@
+/**
+* Please import your styles in order of atomicity.
+* The most atomic styles should be imported first.
+* This will help improve specificity and reduce the chance of
+* unintended overrides.
+**/
+@import 'account-list-item/index';
+@import 'account-list-menu/index';
+@import 'multichain-token-list-item/multichain-token-list-item';
diff --git a/ui/components/multichain/multichain-import-token-link/__snapshots__/multichain-import-token-link.test.js.snap b/ui/components/multichain/multichain-import-token-link/__snapshots__/multichain-import-token-link.test.js.snap
new file mode 100644
index 000000000..925788efa
--- /dev/null
+++ b/ui/components/multichain/multichain-import-token-link/__snapshots__/multichain-import-token-link.test.js.snap
@@ -0,0 +1,75 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Import Token Link should match snapshot for goerli chainId 1`] = `
+<div>
+  <div
+    class="box multichain-import-token-link box--flex-direction-row"
+  >
+    <div
+      class="box box--display-flex box--flex-direction-row box--align-items-center"
+    >
+      <button
+        class="box mm-text mm-button-base mm-button-base--size-md mm-button-link mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+        data-testid="import-token-button"
+      >
+        <span
+          class="box mm-icon mm-icon--size-sm box--margin-inline-end-1 box--display-inline-block box--flex-direction-row box--color-inherit"
+          style="mask-image: url('./images/icons/add.svg');"
+        />
+        Import tokens
+      </button>
+    </div>
+    <div
+      class="box box--padding-top-4 box--padding-bottom-4 box--display-flex box--flex-direction-row box--align-items-center"
+    >
+      <button
+        class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+        data-testid="refresh-list-button"
+      >
+        <span
+          class="box mm-icon mm-icon--size-sm box--margin-inline-end-1 box--display-inline-block box--flex-direction-row box--color-inherit"
+          style="mask-image: url('./images/icons/refresh.svg');"
+        />
+        Refresh list
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Import Token Link should match snapshot for mainnet chainId 1`] = `
+<div>
+  <div
+    class="box multichain-import-token-link box--flex-direction-row"
+  >
+    <div
+      class="box box--display-flex box--flex-direction-row box--align-items-center"
+    >
+      <button
+        class="box mm-text mm-button-base mm-button-base--size-md mm-button-link mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+        data-testid="import-token-button"
+      >
+        <span
+          class="box mm-icon mm-icon--size-sm box--margin-inline-end-1 box--display-inline-block box--flex-direction-row box--color-inherit"
+          style="mask-image: url('./images/icons/add.svg');"
+        />
+        Import tokens
+      </button>
+    </div>
+    <div
+      class="box box--padding-top-4 box--padding-bottom-4 box--display-flex box--flex-direction-row box--align-items-center"
+    >
+      <button
+        class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+        data-testid="refresh-list-button"
+      >
+        <span
+          class="box mm-icon mm-icon--size-sm box--margin-inline-end-1 box--display-inline-block box--flex-direction-row box--color-inherit"
+          style="mask-image: url('./images/icons/refresh.svg');"
+        />
+        Refresh list
+      </button>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/multichain/multichain-import-token-link/index.js b/ui/components/multichain/multichain-import-token-link/index.js
new file mode 100644
index 000000000..c9899d119
--- /dev/null
+++ b/ui/components/multichain/multichain-import-token-link/index.js
@@ -0,0 +1 @@
+export { MultichainImportTokenLink } from './multichain-import-token-link';
diff --git a/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.js b/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.js
new file mode 100644
index 000000000..fc6dae84a
--- /dev/null
+++ b/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.js
@@ -0,0 +1,87 @@
+import React, { useContext } from 'react';
+import { useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import Box from '../../ui/box/box';
+import { ButtonLink, ICON_NAMES } from '../../component-library';
+import {
+  AlignItems,
+  DISPLAY,
+  Size,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { IMPORT_TOKEN_ROUTE } from '../../../helpers/constants/routes';
+import { detectNewTokens } from '../../../store/actions';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  getIsTokenDetectionSupported,
+  getIsTokenDetectionInactiveOnMainnet,
+} from '../../../selectors';
+
+export const MultichainImportTokenLink = ({ className, ...props }) => {
+  const trackEvent = useContext(MetaMetricsContext);
+  const t = useI18nContext();
+  const history = useHistory();
+
+  const isTokenDetectionSupported = useSelector(getIsTokenDetectionSupported);
+  const isTokenDetectionInactiveOnMainnet = useSelector(
+    getIsTokenDetectionInactiveOnMainnet,
+  );
+
+  const isTokenDetectionAvailable =
+    isTokenDetectionSupported ||
+    isTokenDetectionInactiveOnMainnet ||
+    Boolean(process.env.IN_TEST);
+  return (
+    <Box
+      className={classnames('multichain-import-token-link', className)}
+      {...props}
+    >
+      <Box display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+        <ButtonLink
+          size={Size.MD}
+          data-testid="import-token-button"
+          startIconName={ICON_NAMES.ADD}
+          onClick={() => {
+            history.push(IMPORT_TOKEN_ROUTE);
+            trackEvent({
+              event: EVENT_NAMES.TOKEN_IMPORT_BUTTON_CLICKED,
+              category: EVENT.CATEGORIES.NAVIGATION,
+              properties: {
+                location: 'Home',
+              },
+            });
+          }}
+        >
+          {isTokenDetectionAvailable
+            ? t('importTokensCamelCase')
+            : t('importTokensCamelCase').charAt(0).toUpperCase() +
+              t('importTokensCamelCase').slice(1)}
+        </ButtonLink>
+      </Box>
+      <Box
+        display={DISPLAY.FLEX}
+        alignItems={AlignItems.center}
+        paddingBottom={4}
+        paddingTop={4}
+      >
+        <ButtonLink
+          startIconName={ICON_NAMES.REFRESH}
+          data-testid="refresh-list-button"
+          onClick={() => detectNewTokens()}
+        >
+          {t('refreshList')}
+        </ButtonLink>
+      </Box>
+    </Box>
+  );
+};
+
+MultichainImportTokenLink.propTypes = {
+  /**
+   * An additional className to apply to the TokenList.
+   */
+  className: PropTypes.string,
+};
diff --git a/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.stories.js b/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.stories.js
new file mode 100644
index 000000000..1cb7b4395
--- /dev/null
+++ b/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.stories.js
@@ -0,0 +1,11 @@
+import React from 'react';
+import { MultichainImportTokenLink } from './multichain-import-token-link';
+
+export default {
+  title: 'Components/Multichain/MultichainImportTokenLink',
+  component: MultichainImportTokenLink,
+};
+
+export const DefaultStory = () => <MultichainImportTokenLink />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.test.js b/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.test.js
new file mode 100644
index 000000000..dd376c52b
--- /dev/null
+++ b/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.test.js
@@ -0,0 +1,101 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { fireEvent, screen } from '@testing-library/react';
+import { detectNewTokens } from '../../../store/actions';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import { MultichainImportTokenLink } from './multichain-import-token-link';
+
+const mockPushHistory = jest.fn();
+
+jest.mock('react-router-dom', () => {
+  const original = jest.requireActual('react-router-dom');
+  return {
+    ...original,
+    useLocation: jest.fn(() => ({ search: '' })),
+    useHistory: () => ({
+      push: mockPushHistory,
+    }),
+  };
+});
+
+jest.mock('../../../store/actions.ts', () => ({
+  detectNewTokens: jest.fn(),
+}));
+
+describe('Import Token Link', () => {
+  it('should match snapshot for goerli chainId', () => {
+    const mockState = {
+      metamask: {
+        provider: {
+          chainId: '0x5',
+        },
+      },
+    };
+
+    const store = configureMockStore()(mockState);
+
+    const { container } = renderWithProvider(
+      <MultichainImportTokenLink />,
+      store,
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should match snapshot for mainnet chainId', () => {
+    const mockState = {
+      metamask: {
+        provider: {
+          chainId: '0x1',
+        },
+      },
+    };
+
+    const store = configureMockStore()(mockState);
+
+    const { container } = renderWithProvider(
+      <MultichainImportTokenLink />,
+      store,
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should detectNewTokens when clicking refresh', () => {
+    const mockState = {
+      metamask: {
+        provider: {
+          chainId: '0x5',
+        },
+      },
+    };
+
+    const store = configureMockStore()(mockState);
+
+    renderWithProvider(<MultichainImportTokenLink />, store);
+
+    const refreshList = screen.getByTestId('refresh-list-button');
+    fireEvent.click(refreshList);
+
+    expect(detectNewTokens).toHaveBeenCalled();
+  });
+
+  it('should push import token route', () => {
+    const mockState = {
+      metamask: {
+        provider: {
+          chainId: '0x5',
+        },
+      },
+    };
+
+    const store = configureMockStore()(mockState);
+
+    renderWithProvider(<MultichainImportTokenLink />, store);
+
+    const importToken = screen.getByTestId('import-token-button');
+    fireEvent.click(importToken);
+
+    expect(mockPushHistory).toHaveBeenCalledWith('/import-token');
+  });
+});
diff --git a/ui/components/multichain/multichain-token-list-item/__snapshots__/multichain-token-list-item.test.js.snap b/ui/components/multichain/multichain-token-list-item/__snapshots__/multichain-token-list-item.test.js.snap
new file mode 100644
index 000000000..b4af82ccb
--- /dev/null
+++ b/ui/components/multichain/multichain-token-list-item/__snapshots__/multichain-token-list-item.test.js.snap
@@ -0,0 +1,67 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`MultichainTokenListItem should render correctly 1`] = `
+<div>
+  <div
+    class="box multichain-token-list-item box--display-flex box--gap-4 box--flex-direction-column"
+    data-testid="multichain-token-list-item"
+  >
+    <a
+      class="box multichain-token-list-item__container-cell box--padding-4 box--display-flex box--flex-direction-row"
+      data-testid="multichain-token-list-button"
+      href="#"
+    >
+      <div
+        class="box mm-badge-wrapper box--margin-right-3 box--display-inline-block box--flex-direction-row"
+      >
+        <div
+          class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
+        >
+          ?
+        </div>
+        <div
+          class="box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right box--flex-direction-row"
+        >
+          <div
+            class="box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-border-muted box--border-style-solid box--border-width-1"
+          >
+            <img
+              alt="undefined logo"
+              class="mm-avatar-network__network-image"
+              src="./images/eth_logo.svg"
+            />
+          </div>
+        </div>
+      </div>
+      <div
+        class="box multichain-token-list-item__container-cell--text-container box--display-flex box--flex-direction-column box--width-full"
+        style="flex-grow: 1; overflow: hidden;"
+      >
+        <div
+          class="box box--display-flex box--gap-1 box--flex-direction-row box--justify-content-space-between"
+        >
+          <div
+            class="box box--flex-direction-row box--width-1/3"
+          >
+            <div>
+              <p
+                class="box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-text--color-text-default box--flex-direction-row"
+              />
+            </div>
+          </div>
+          <p
+            class="box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-text--color-text-default box--flex-direction-row"
+          />
+        </div>
+        <p
+          class="box mm-text mm-text--body-md mm-text--color-text-alternative box--flex-direction-row"
+        >
+          NaN
+           
+           
+        </p>
+      </div>
+    </a>
+  </div>
+</div>
+`;
diff --git a/ui/components/multichain/multichain-token-list-item/index.js b/ui/components/multichain/multichain-token-list-item/index.js
new file mode 100644
index 000000000..bccfac8ab
--- /dev/null
+++ b/ui/components/multichain/multichain-token-list-item/index.js
@@ -0,0 +1 @@
+export { MultichainTokenListItem } from './multichain-token-list-item';
diff --git a/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.js b/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.js
new file mode 100644
index 000000000..82ed77524
--- /dev/null
+++ b/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.js
@@ -0,0 +1,162 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+import classnames from 'classnames';
+import {
+  BLOCK_SIZES,
+  BorderColor,
+  DISPLAY,
+  FLEX_DIRECTION,
+  FONT_WEIGHT,
+  JustifyContent,
+  Size,
+  TextColor,
+  TextVariant,
+  TEXT_ALIGN,
+} from '../../../helpers/constants/design-system';
+import {
+  AvatarNetwork,
+  AvatarToken,
+  BadgeWrapper,
+  Text,
+} from '../../component-library';
+import Box from '../../ui/box/box';
+import { getNativeCurrencyImage } from '../../../selectors';
+import Tooltip from '../../ui/tooltip';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+export const MultichainTokenListItem = ({
+  className,
+  onClick,
+  tokenSymbol,
+  tokenImage,
+  primary,
+  secondary,
+  title,
+}) => {
+  const t = useI18nContext();
+  const primaryTokenImage = useSelector(getNativeCurrencyImage);
+  const dataTheme = document.documentElement.getAttribute('data-theme');
+  return (
+    <Box
+      className={classnames('multichain-token-list-item', className)}
+      display={DISPLAY.FLEX}
+      flexDirection={FLEX_DIRECTION.COLUMN}
+      gap={4}
+      data-testid="multichain-token-list-item"
+    >
+      <Box
+        className="multichain-token-list-item__container-cell"
+        display={DISPLAY.FLEX}
+        flexDirection={FLEX_DIRECTION.ROW}
+        padding={4}
+        as="a"
+        data-testid="multichain-token-list-button"
+        href="#"
+        onClick={(e) => {
+          e.preventDefault();
+          onClick();
+        }}
+      >
+        <BadgeWrapper
+          badge={
+            <AvatarNetwork
+              size={Size.XS}
+              name={tokenSymbol}
+              src={primaryTokenImage}
+              borderColor={
+                primaryTokenImage
+                  ? BorderColor.borderMuted
+                  : BorderColor.borderDefault
+              }
+            />
+          }
+          marginRight={3}
+        >
+          <AvatarToken
+            name={tokenSymbol}
+            src={tokenImage}
+            showHalo
+            borderColor={
+              tokenImage ? BorderColor.transparent : BorderColor.borderDefault
+            }
+          />
+        </BadgeWrapper>
+        <Box
+          className="multichain-token-list-item__container-cell--text-container"
+          display={DISPLAY.FLEX}
+          flexDirection={FLEX_DIRECTION.COLUMN}
+          width={BLOCK_SIZES.FULL}
+          style={{ flexGrow: 1, overflow: 'hidden' }}
+        >
+          <Box
+            display={DISPLAY.FLEX}
+            justifyContent={JustifyContent.spaceBetween}
+            gap={1}
+          >
+            <Box width={[BLOCK_SIZES.ONE_THIRD]}>
+              <Tooltip
+                position="bottom"
+                interactive
+                html={title}
+                disabled={title?.length < 12}
+                tooltipInnerClassName="multichain-token-list-item__tooltip"
+                theme={dataTheme === 'light' ? 'dark' : 'light'}
+              >
+                <Text
+                  fontWeight={FONT_WEIGHT.MEDIUM}
+                  variant={TextVariant.bodyMd}
+                  ellipsis
+                >
+                  {title === 'ETH' ? t('networkNameEthereum') : title}
+                </Text>
+              </Tooltip>
+            </Box>
+            <Text
+              fontWeight={FONT_WEIGHT.MEDIUM}
+              variant={TextVariant.bodyMd}
+              width={[BLOCK_SIZES.TWO_THIRD]}
+              textAlign={TEXT_ALIGN.END}
+            >
+              {secondary}
+            </Text>
+          </Box>
+          <Text color={TextColor.textAlternative}>
+            {Number(primary).toFixed(3)} {tokenSymbol}{' '}
+          </Text>
+        </Box>
+      </Box>
+    </Box>
+  );
+};
+
+MultichainTokenListItem.propTypes = {
+  /**
+   * An additional className to apply to the TokenList.
+   */
+  className: PropTypes.string,
+  /**
+   * The onClick handler to be passed to the MultichainTokenListItem component
+   */
+  onClick: PropTypes.func,
+  /**
+   * tokenSymbol represents the symbol of the Token
+   */
+  tokenSymbol: PropTypes.string,
+  /**
+   * title represents the name of the token and if name is not available then Symbol
+   */
+  title: PropTypes.string,
+  /**
+   * tokenImage represnts the image of the token icon
+   */
+  tokenImage: PropTypes.string,
+  /**
+   * primary represents the balance
+   */
+  primary: PropTypes.string,
+  /**
+   * secondary represents the balance in dollars
+   */
+  secondary: PropTypes.string,
+};
diff --git a/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.scss b/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.scss
new file mode 100644
index 000000000..f6863f8b3
--- /dev/null
+++ b/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.scss
@@ -0,0 +1,8 @@
+.multichain-token-list-item {
+  &__container-cell {
+    &:hover,
+    &:focus-within {
+      background-color: var(--color-background-default-hover);
+    }
+  }
+}
diff --git a/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.stories.js b/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.stories.js
new file mode 100644
index 000000000..168e6ed1a
--- /dev/null
+++ b/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.stories.js
@@ -0,0 +1,78 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import testData from '../../../../.storybook/test-data';
+import configureStore from '../../../store/store';
+import { MultichainTokenListItem } from './multichain-token-list-item';
+
+export default {
+  title: 'Components/Multichain/MultichainTokenListItem',
+  component: MultichainTokenListItem,
+  argTypes: {
+    tokenSymbol: {
+      control: 'text',
+    },
+    tokenImage: {
+      control: 'text',
+    },
+    primary: {
+      control: 'text',
+    },
+    secondary: {
+      control: 'text',
+    },
+    title: {
+      control: 'text',
+    },
+    onClick: {
+      action: 'onClick',
+    },
+  },
+  args: {
+    secondary: '$9.80 USD',
+    primary: '88.00687889',
+    tokenImage: './images/eth_logo.svg',
+    tokenSymbol: 'ETH',
+    title: 'Ethereum',
+  },
+};
+
+const customNetworkData = {
+  ...testData,
+  metamask: { ...testData.metamask, nativeCurrency: '' },
+};
+const customNetworkStore = configureStore(customNetworkData);
+
+const Template = (args) => {
+  return <MultichainTokenListItem {...args} />;
+};
+
+export const DefaultStory = Template.bind({});
+
+export const ChaosStory = (args) => (
+  <div
+    style={{ width: '336px', border: '1px solid var(--color-border-muted)' }}
+  >
+    <MultichainTokenListItem {...args} />
+  </div>
+);
+ChaosStory.storyName = 'ChaosStory';
+
+ChaosStory.args = {
+  title: 'Really long, long name',
+  secondary: '$94556756776.80 USD',
+  primary: '34449765768526.00',
+};
+
+export const NoImagesStory = Template.bind({});
+
+NoImagesStory.decorators = [
+  (Story) => (
+    <Provider store={customNetworkStore}>
+      <Story />
+    </Provider>
+  ),
+];
+
+NoImagesStory.args = {
+  tokenImage: '',
+};
diff --git a/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.test.js b/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.test.js
new file mode 100644
index 000000000..6f0498298
--- /dev/null
+++ b/ui/components/multichain/multichain-token-list-item/multichain-token-list-item.test.js
@@ -0,0 +1,57 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+
+import { fireEvent } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import { MultichainTokenListItem } from './multichain-token-list-item';
+
+const state = {
+  metamask: {
+    provider: {
+      ticker: 'ETH',
+      nickname: '',
+      chainId: '0x1',
+      type: 'mainnet',
+    },
+    useTokenDetection: false,
+    nativeCurrency: 'ETH',
+  },
+};
+
+describe('MultichainTokenListItem', () => {
+  const props = {
+    onClick: jest.fn(),
+  };
+  it('should render correctly', () => {
+    const store = configureMockStore()(state);
+    const { getByTestId, container } = renderWithProvider(
+      <MultichainTokenListItem />,
+      store,
+    );
+    expect(getByTestId('multichain-token-list-item')).toBeDefined();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render with custom className', () => {
+    const store = configureMockStore()(state);
+    const { getByTestId } = renderWithProvider(
+      <MultichainTokenListItem className="multichain-token-list-item-test" />,
+      store,
+    );
+    expect(getByTestId('multichain-token-list-item')).toHaveClass(
+      'multichain-token-list-item-test',
+    );
+  });
+
+  it('handles click action and fires onClick', () => {
+    const store = configureMockStore()(state);
+    const { queryByTestId } = renderWithProvider(
+      <MultichainTokenListItem {...props} />,
+      store,
+    );
+
+    fireEvent.click(queryByTestId('multichain-token-list-button'));
+
+    expect(props.onClick).toHaveBeenCalled();
+  });
+});
diff --git a/ui/components/ui/tooltip/index.scss b/ui/components/ui/tooltip/index.scss
index 8ae602e33..3bc86f910 100644
--- a/ui/components/ui/tooltip/index.scss
+++ b/ui/components/ui/tooltip/index.scss
@@ -26,19 +26,19 @@
     }
   }
 
-  &[x-placement^=top] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
+  &[x-placement^='top'] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
     border-top-color: var(--color-background-default);
   }
 
-  &[x-placement^=right] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
+  &[x-placement^='right'] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
     border-right-color: var(--color-background-default);
   }
 
-  &[x-placement^=left] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
+  &[x-placement^='left'] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
     border-left-color: var(--color-background-default);
   }
 
-  &[x-placement^=bottom] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
+  &[x-placement^='bottom'] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
     border-bottom-color: var(--color-background-default);
   }
 }
diff --git a/ui/css/index.scss b/ui/css/index.scss
index 46e1e7f2b..a26c7ae09 100644
--- a/ui/css/index.scss
+++ b/ui/css/index.scss
@@ -10,8 +10,8 @@
 @import './base-styles.scss';
 @import '../components/component-library/component-library-components.scss';
 @import '../components/app/app-components';
-@import '../components/multichain/index.scss';
 @import '../components/ui/ui-components';
+@import '../components/multichain/multichain-components.scss';
 @import '../pages/pages';
 @import './errors.scss';
 @import './loading.scss';

From 8c310a0a8b6b83e139ba56f17c8641a9cfb7fec9 Mon Sep 17 00:00:00 2001
From: aleksandar-mihajlovic
 <120601632+aleksandar-mihajlovic@users.noreply.github.com>
Date: Thu, 23 Mar 2023 11:35:25 +0100
Subject: [PATCH 054/129] Fix for hovering any Address parsed on Signed Type
 Data screen does not display the pointer anymore (#18046)

* Signed Type Data address hover fix

* Snapshots fix

* Snapshots update fix

* Update snapshot
---
 .../signature-request.component.test.js.snap  | 20 +++++++++----------
 .../decoding/address/address.component.js     |  2 +-
 .../components/decoding/address/index.scss    | 19 +++++++++---------
 .../__snapshots__/index.test.js.snap          | 10 +++++-----
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap b/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap
index 8a8ddd8a5..d1e6c7708 100644
--- a/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap
+++ b/ui/components/app/signature-request/__snapshots__/signature-request.component.test.js.snap
@@ -369,7 +369,7 @@ exports[`Signature Request Component render should match snapshot when we are us
                             </div>
                           </div>
                           <div
-                            class="address__name"
+                            class="tx-insight-component-address__name"
                           >
                             0xCD2...D826
                           </div>
@@ -445,7 +445,7 @@ exports[`Signature Request Component render should match snapshot when we are us
                             </div>
                           </div>
                           <div
-                            class="address__name"
+                            class="tx-insight-component-address__name"
                           >
                             0xDea...beeF
                           </div>
@@ -580,7 +580,7 @@ exports[`Signature Request Component render should match snapshot when we are us
                                 </div>
                               </div>
                               <div
-                                class="address__name"
+                                class="tx-insight-component-address__name"
                               >
                                 0xbBb...BBbB
                               </div>
@@ -656,7 +656,7 @@ exports[`Signature Request Component render should match snapshot when we are us
                                 </div>
                               </div>
                               <div
-                                class="address__name"
+                                class="tx-insight-component-address__name"
                               >
                                 0xB0B...Ea57
                               </div>
@@ -732,7 +732,7 @@ exports[`Signature Request Component render should match snapshot when we are us
                                 </div>
                               </div>
                               <div
-                                class="address__name"
+                                class="tx-insight-component-address__name"
                               >
                                 0xB0B...0000
                               </div>
@@ -1144,7 +1144,7 @@ exports[`Signature Request Component render should match snapshot when we want t
                             </div>
                           </div>
                           <div
-                            class="address__name"
+                            class="tx-insight-component-address__name"
                           >
                             0xCD2...D826
                           </div>
@@ -1220,7 +1220,7 @@ exports[`Signature Request Component render should match snapshot when we want t
                             </div>
                           </div>
                           <div
-                            class="address__name"
+                            class="tx-insight-component-address__name"
                           >
                             0xDea...beeF
                           </div>
@@ -1355,7 +1355,7 @@ exports[`Signature Request Component render should match snapshot when we want t
                                 </div>
                               </div>
                               <div
-                                class="address__name"
+                                class="tx-insight-component-address__name"
                               >
                                 0xbBb...BBbB
                               </div>
@@ -1431,7 +1431,7 @@ exports[`Signature Request Component render should match snapshot when we want t
                                 </div>
                               </div>
                               <div
-                                class="address__name"
+                                class="tx-insight-component-address__name"
                               >
                                 0xB0B...Ea57
                               </div>
@@ -1507,7 +1507,7 @@ exports[`Signature Request Component render should match snapshot when we want t
                                 </div>
                               </div>
                               <div
-                                class="address__name"
+                                class="tx-insight-component-address__name"
                               >
                                 0xB0B...0000
                               </div>
diff --git a/ui/components/app/transaction-decoding/components/decoding/address/address.component.js b/ui/components/app/transaction-decoding/components/decoding/address/address.component.js
index 9b576b5b3..21220448a 100644
--- a/ui/components/app/transaction-decoding/components/decoding/address/address.component.js
+++ b/ui/components/app/transaction-decoding/components/decoding/address/address.component.js
@@ -58,7 +58,7 @@ const Address = ({
       </div>
 
       <div
-        className="address__name"
+        className="tx-insight-component-address__name"
         onClick={() => setShowNicknamePopovers(true)}
       >
         {recipientToRender}
diff --git a/ui/components/app/transaction-decoding/components/decoding/address/index.scss b/ui/components/app/transaction-decoding/components/decoding/address/index.scss
index ca821dae8..71bf88fad 100644
--- a/ui/components/app/transaction-decoding/components/decoding/address/index.scss
+++ b/ui/components/app/transaction-decoding/components/decoding/address/index.scss
@@ -1,12 +1,13 @@
-.tx-insight-content {
-  .tx-insight-component-address {
-    display: flex;
-    align-items: center;
-    cursor: pointer;
-    overflow: visible;
+.tx-insight-component-address {
+  display: flex;
+  align-items: center;
+  overflow: visible;
 
-    &__sender-icon {
-      padding-right: 5px;
-    }
+  &__sender-icon {
+    padding-right: 5px;
+  }
+
+  &__name {
+    cursor: pointer;
   }
 }
diff --git a/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap b/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap
index e795ab35d..fbf3c10c1 100644
--- a/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap
+++ b/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap
@@ -368,7 +368,7 @@ exports[`Signature Request Component render should match snapshot 1`] = `
                             </div>
                           </div>
                           <div
-                            class="address__name"
+                            class="tx-insight-component-address__name"
                           >
                             0xCD2...D826
                           </div>
@@ -444,7 +444,7 @@ exports[`Signature Request Component render should match snapshot 1`] = `
                             </div>
                           </div>
                           <div
-                            class="address__name"
+                            class="tx-insight-component-address__name"
                           >
                             0xDea...beeF
                           </div>
@@ -579,7 +579,7 @@ exports[`Signature Request Component render should match snapshot 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="address__name"
+                                class="tx-insight-component-address__name"
                               >
                                 0xbBb...BBbB
                               </div>
@@ -655,7 +655,7 @@ exports[`Signature Request Component render should match snapshot 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="address__name"
+                                class="tx-insight-component-address__name"
                               >
                                 0xB0B...Ea57
                               </div>
@@ -731,7 +731,7 @@ exports[`Signature Request Component render should match snapshot 1`] = `
                                 </div>
                               </div>
                               <div
-                                class="address__name"
+                                class="tx-insight-component-address__name"
                               >
                                 0xB0B...0000
                               </div>

From 447435959166a9194c229baf09a70ff5f29fb70b Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Thu, 23 Mar 2023 05:55:00 -0700
Subject: [PATCH 055/129] Fix overflowing UI & buttons in Signature Request
 screens  (#18247)

* signature-req: fix overflow ui

* signature-req: fix uneven btn height
---
 .../app/signature-request-original/index.scss          | 10 +++++-----
 ui/components/ui/page-container/index.scss             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/components/app/signature-request-original/index.scss b/ui/components/app/signature-request-original/index.scss
index 01182eda8..281fae02f 100644
--- a/ui/components/app/signature-request-original/index.scss
+++ b/ui/components/app/signature-request-original/index.scss
@@ -62,11 +62,11 @@
   }
 
   &__body {
-    width: 100%;
-    height: 100%;
     display: flex;
     flex-flow: column;
-    flex: 1 1 auto;
+    flex: 1 1 0;
+    min-height: 0;
+    max-width: 100%;
   }
 
   &__origin {
@@ -92,18 +92,18 @@
   }
 
   &__rows {
-    height: 100%;
     overflow-y: auto;
     overflow-x: hidden;
     border-top: 1px solid var(--color-border-default);
     display: flex;
     flex-flow: column;
+    flex: 1 1 0;
+    min-height: 0;
   }
 
   &__row {
     display: flex;
     flex-flow: column;
-    flex: 1 0 auto;
   }
 
   &__row-title {
diff --git a/ui/components/ui/page-container/index.scss b/ui/components/ui/page-container/index.scss
index cec98678a..1e37799af 100644
--- a/ui/components/ui/page-container/index.scss
+++ b/ui/components/ui/page-container/index.scss
@@ -190,7 +190,7 @@
       margin-right: 0;
 
       &:first-of-type {
-        margin-bottom: 0;
+        margin-right: 4px;
       }
     }
   }

From 99bdf8458cef8243c6ee39f69ba9f646a01b6214 Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Thu, 23 Mar 2023 06:36:09 -0700
Subject: [PATCH 056/129] Adding ModalOverlay component (#18161)

---
 .../component-library-components.scss         |  2 +
 ui/components/component-library/index.js      |  1 +
 .../modal-overlay/README.mdx                  | 40 +++++++++++++++++
 .../__snapshots__/modal-overlay.test.tsx.snap |  9 ++++
 .../component-library/modal-overlay/index.ts  |  2 +
 .../modal-overlay/modal-overlay.scss          |  7 +++
 .../modal-overlay/modal-overlay.stories.tsx   | 44 +++++++++++++++++++
 .../modal-overlay/modal-overlay.test.tsx      | 32 ++++++++++++++
 .../modal-overlay/modal-overlay.tsx           | 28 ++++++++++++
 .../modal-overlay/modal-overlay.types.ts      | 13 ++++++
 10 files changed, 178 insertions(+)
 create mode 100644 ui/components/component-library/modal-overlay/README.mdx
 create mode 100644 ui/components/component-library/modal-overlay/__snapshots__/modal-overlay.test.tsx.snap
 create mode 100644 ui/components/component-library/modal-overlay/index.ts
 create mode 100644 ui/components/component-library/modal-overlay/modal-overlay.scss
 create mode 100644 ui/components/component-library/modal-overlay/modal-overlay.stories.tsx
 create mode 100644 ui/components/component-library/modal-overlay/modal-overlay.test.tsx
 create mode 100644 ui/components/component-library/modal-overlay/modal-overlay.tsx
 create mode 100644 ui/components/component-library/modal-overlay/modal-overlay.types.ts

diff --git a/ui/components/component-library/component-library-components.scss b/ui/components/component-library/component-library-components.scss
index 618b089ad..4068f6af5 100644
--- a/ui/components/component-library/component-library-components.scss
+++ b/ui/components/component-library/component-library-components.scss
@@ -30,3 +30,5 @@
 @import 'banner-alert/banner-alert';
 @import 'banner-tip/banner-tip';
 @import 'modal-content/modal-content';
+@import 'modal-overlay/modal-overlay';
+
diff --git a/ui/components/component-library/index.js b/ui/components/component-library/index.js
index e1b2f1408..33e8ab604 100644
--- a/ui/components/component-library/index.js
+++ b/ui/components/component-library/index.js
@@ -32,6 +32,7 @@ export { Input, INPUT_TYPES } from './input';
 export { TextField, TEXT_FIELD_TYPES, TEXT_FIELD_SIZES } from './text-field';
 export { TextFieldSearch } from './text-field-search';
 export { ModalContent, ModalContentSize } from './modal-content';
+export { ModalOverlay } from './modal-overlay';
 
 // Molecules
 export { BannerBase } from './banner-base';
diff --git a/ui/components/component-library/modal-overlay/README.mdx b/ui/components/component-library/modal-overlay/README.mdx
new file mode 100644
index 000000000..cb42da5d0
--- /dev/null
+++ b/ui/components/component-library/modal-overlay/README.mdx
@@ -0,0 +1,40 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import { ModalOverlay } from './modal-overlay';
+
+# ModalOverlay
+
+`ModalOverlay` is a transparent overlay that covers the entire screen. It is used to dim the background when a modal is open.
+
+<Canvas>
+  <Story id="components-componentlibrary-modaloverlay--default-story" />
+</Canvas>
+
+## Props
+
+The `ModalOverlay` accepts all props below as well as all [Box](/docs/components-ui-box--default-story#props) component props
+
+<ArgsTable of={ModalOverlay} />
+
+### On Click
+
+Use the `onClick` prop to handle clicks on the overlay
+
+<Canvas>
+  <Story id="components-componentlibrary-modaloverlay--on-click" />
+</Canvas>
+
+```jsx
+import React, { useState } from 'react';
+import { ModalOverlay } from '../../component-library';
+
+const [open, setOpen] = useState(false);
+const handleOnClick = () => {
+  setOpen(!open);
+};
+
+<button onClick={handleOnClick}>Show modal overlay</button>;
+{
+  open && <ModalOverlay onClick={handleOnClick} />;
+}
+```
diff --git a/ui/components/component-library/modal-overlay/__snapshots__/modal-overlay.test.tsx.snap b/ui/components/component-library/modal-overlay/__snapshots__/modal-overlay.test.tsx.snap
new file mode 100644
index 000000000..10f22ae8d
--- /dev/null
+++ b/ui/components/component-library/modal-overlay/__snapshots__/modal-overlay.test.tsx.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ModalOverlay should match snapshot 1`] = `
+<div>
+  <div
+    class="box mm-modal-overlay box--flex-direction-row box--width-full box--height-full box--background-color-overlay-default"
+  />
+</div>
+`;
diff --git a/ui/components/component-library/modal-overlay/index.ts b/ui/components/component-library/modal-overlay/index.ts
new file mode 100644
index 000000000..bc283f898
--- /dev/null
+++ b/ui/components/component-library/modal-overlay/index.ts
@@ -0,0 +1,2 @@
+export { ModalOverlay } from './modal-overlay';
+export type { ModalOverlayProps } from './modal-overlay.types';
diff --git a/ui/components/component-library/modal-overlay/modal-overlay.scss b/ui/components/component-library/modal-overlay/modal-overlay.scss
new file mode 100644
index 000000000..afa528a18
--- /dev/null
+++ b/ui/components/component-library/modal-overlay/modal-overlay.scss
@@ -0,0 +1,7 @@
+.mm-modal-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
diff --git a/ui/components/component-library/modal-overlay/modal-overlay.stories.tsx b/ui/components/component-library/modal-overlay/modal-overlay.stories.tsx
new file mode 100644
index 000000000..fb2cec597
--- /dev/null
+++ b/ui/components/component-library/modal-overlay/modal-overlay.stories.tsx
@@ -0,0 +1,44 @@
+import React, { useState } from 'react';
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+
+import { ModalOverlay } from './modal-overlay';
+
+import README from './README.mdx';
+
+export default {
+  title: 'Components/ComponentLibrary/ModalOverlay',
+  component: ModalOverlay,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    className: {
+      control: 'text',
+    },
+    onClick: {
+      action: 'onClick',
+    },
+  },
+} as ComponentMeta<typeof ModalOverlay>;
+
+const Template: ComponentStory<typeof ModalOverlay> = (args) => (
+  <ModalOverlay {...args} />
+);
+
+export const DefaultStory = Template.bind({});
+DefaultStory.storyName = 'Default';
+
+export const OnClick: ComponentStory<typeof ModalOverlay> = (args) => {
+  const [open, setOpen] = useState(false);
+  const handleOnClick = () => {
+    setOpen(!open);
+  };
+  return (
+    <>
+      <button onClick={handleOnClick}>Show modal overlay</button>
+      {open && <ModalOverlay {...args} onClick={handleOnClick} />}
+    </>
+  );
+};
diff --git a/ui/components/component-library/modal-overlay/modal-overlay.test.tsx b/ui/components/component-library/modal-overlay/modal-overlay.test.tsx
new file mode 100644
index 000000000..e33471766
--- /dev/null
+++ b/ui/components/component-library/modal-overlay/modal-overlay.test.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+
+import { ModalOverlay } from './modal-overlay';
+
+describe('ModalOverlay', () => {
+  it('should render ModalOverlay without error', () => {
+    const { getByTestId } = render(
+      <ModalOverlay data-testid="modal-overlay" />,
+    );
+    expect(getByTestId('modal-overlay')).toBeDefined();
+    expect(getByTestId('modal-overlay')).toHaveClass('mm-modal-overlay');
+  });
+  it('should match snapshot', () => {
+    const { container } = render(<ModalOverlay />);
+    expect(container).toMatchSnapshot();
+  });
+  it('should render with and additional className', () => {
+    const { getByTestId } = render(
+      <ModalOverlay data-testid="modal-overlay" className="test-class" />,
+    );
+    expect(getByTestId('modal-overlay')).toHaveClass('test-class');
+  });
+  it('should fire the onClick function when clicked', () => {
+    const onClick = jest.fn();
+    const { getByTestId } = render(
+      <ModalOverlay data-testid="modal-overlay" onClick={onClick} />,
+    );
+    getByTestId('modal-overlay').click();
+    expect(onClick).toHaveBeenCalled();
+  });
+});
diff --git a/ui/components/component-library/modal-overlay/modal-overlay.tsx b/ui/components/component-library/modal-overlay/modal-overlay.tsx
new file mode 100644
index 000000000..76b9586cb
--- /dev/null
+++ b/ui/components/component-library/modal-overlay/modal-overlay.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import classnames from 'classnames';
+
+import {
+  BackgroundColor,
+  BLOCK_SIZES,
+} from '../../../helpers/constants/design-system';
+
+import Box from '../../ui/box/box';
+
+import { ModalOverlayProps } from './modal-overlay.types';
+
+export const ModalOverlay: React.FC<ModalOverlayProps> = ({
+  onClick,
+  className = '',
+  ...props
+}) => (
+  <Box
+    className={classnames('mm-modal-overlay', className)}
+    backgroundColor={BackgroundColor.overlayDefault}
+    width={BLOCK_SIZES.FULL}
+    height={BLOCK_SIZES.FULL}
+    onClick={onClick}
+    {...props}
+  />
+);
+
+export default ModalOverlay;
diff --git a/ui/components/component-library/modal-overlay/modal-overlay.types.ts b/ui/components/component-library/modal-overlay/modal-overlay.types.ts
new file mode 100644
index 000000000..a1045bc96
--- /dev/null
+++ b/ui/components/component-library/modal-overlay/modal-overlay.types.ts
@@ -0,0 +1,13 @@
+import { BoxProps } from '../../ui/box/box.d';
+
+export interface ModalOverlayProps extends BoxProps {
+  /**
+   * onClick handler for the overlay
+   * Not necessary when used with Modal and closeOnClickOutside is true
+   */
+  onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+  /**
+   * Additional className to add to the ModalOverlay
+   */
+  className?: string;
+}

From e424debfc0ed834a06dc825fe6470953ccab1b6a Mon Sep 17 00:00:00 2001
From: vthomas13 <10986371+vthomas13@users.noreply.github.com>
Date: Thu, 23 Mar 2023 10:55:43 -0400
Subject: [PATCH 057/129] adding opensea security provider image (#18292)

---
 app/images/open-sea-security-provider.svg | 91 +++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 app/images/open-sea-security-provider.svg

diff --git a/app/images/open-sea-security-provider.svg b/app/images/open-sea-security-provider.svg
new file mode 100644
index 000000000..ac79c0026
--- /dev/null
+++ b/app/images/open-sea-security-provider.svg
@@ -0,0 +1,91 @@
+<svg width="271" height="176" viewBox="0 0 271 176" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M150.275 168.623C195.543 151.885 220.904 105.028 220.904 71.8728C220.904 14.7024 159.526 -2.49604 126.405 16.4642C90.9002 36.7888 103.565 65.9803 97.0175 89.2448C91.0577 110.421 38.815 111.435 30.446 111.942C22.077 112.45 2.29576 118.283 13.2008 139.966C24.1059 161.649 98.0319 187.94 150.275 168.623Z" fill="url(#paint0_linear_4806_28636)"/>
+<mask id="mask0_4806_28636" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="9" y="9" width="213" height="167">
+<path d="M150.275 168.623C195.543 151.885 220.904 105.028 220.904 71.8728C220.904 14.7024 174.52 -1.23221 141.398 17.728C105.894 38.0526 64.2254 15.0098 57.6779 38.2743C51.7181 59.4504 38.815 111.435 30.446 111.942C22.077 112.45 2.29576 118.283 13.2008 139.966C24.1059 161.649 98.0319 187.94 150.275 168.623Z" fill="#C4C4C4" stroke="black" stroke-width="0.253606"/>
+</mask>
+<g mask="url(#mask0_4806_28636)">
+</g>
+<mask id="mask1_4806_28636" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="9" y="0" width="213" height="176">
+<path d="M150.339 168.557C195.628 151.421 221 103.448 221 69.5037C221 10.9726 152.314 -11.6045 119.177 7.80694C83.6563 28.6153 61.8191 1.36069 55.2686 25.1789C49.3062 46.859 38.8281 110.008 30.4553 110.527C22.0825 111.046 2.29225 117.018 13.2023 139.217C24.1123 161.417 98.072 188.333 150.339 168.557Z" fill="#C4C4C4" stroke="black" stroke-width="0.253606"/>
+</mask>
+<g mask="url(#mask1_4806_28636)">
+<g filter="url(#filter0_d_4806_28636)">
+<rect x="53" y="58" width="141" height="249" fill="url(#pattern0)"/>
+</g>
+<rect x="53" y="67" width="141" height="218" fill="white"/>
+<rect x="96" y="130" width="52" height="28" fill="url(#pattern1)"/>
+<g clip-path="url(#clip0_4806_28636)">
+<rect x="63" y="78" width="121.29" height="45.8694" rx="1.48367" fill="#D73A49" fill-opacity="0.1"/>
+<rect width="1.48367" height="45.8694" transform="translate(63 78)" fill="#D73A49"/>
+<rect x="68.9346" y="82.451" width="8.90202" height="8.90202" rx="4.45101" fill="#D73A49" fill-opacity="0.1"/>
+<path d="M75.4662 87.5855L74.1019 84.9734C73.9186 84.622 73.6649 84.4292 73.3857 84.4292C73.1064 84.4292 72.8527 84.622 72.6694 84.9734L71.3051 87.5855C71.1324 87.9188 71.1132 88.2385 71.2518 88.4902C71.3904 88.7419 71.6632 88.8802 72.0214 88.8802H74.75C75.1081 88.8802 75.381 88.7419 75.5195 88.4902C75.6581 88.2385 75.6389 87.9166 75.4662 87.5855ZM73.2258 86.0164C73.2258 85.9235 73.2983 85.8464 73.3857 85.8464C73.4731 85.8464 73.5455 85.9235 73.5455 86.0164V87.1502C73.5455 87.2431 73.4731 87.3202 73.3857 87.3202C73.2983 87.3202 73.2258 87.2431 73.2258 87.1502V86.0164ZM73.537 87.9914C73.5264 88.0005 73.5157 88.0095 73.505 88.0186C73.4922 88.0277 73.4795 88.0345 73.4667 88.039C73.4539 88.0458 73.4411 88.0504 73.4262 88.0526C73.4134 88.0549 73.3985 88.0572 73.3857 88.0572C73.3729 88.0572 73.3579 88.0549 73.343 88.0526C73.3302 88.0504 73.3174 88.0458 73.3047 88.039C73.2919 88.0345 73.2791 88.0277 73.2663 88.0186C73.2556 88.0095 73.245 88.0005 73.2343 87.9914C73.1959 87.9483 73.1725 87.8894 73.1725 87.8304C73.1725 87.7715 73.1959 87.7125 73.2343 87.6694C73.245 87.6603 73.2556 87.6513 73.2663 87.6422C73.2791 87.6331 73.2919 87.6263 73.3047 87.6218C73.3174 87.615 73.3302 87.6105 73.343 87.6082C73.3707 87.6014 73.4006 87.6014 73.4262 87.6082C73.4411 87.6105 73.4539 87.615 73.4667 87.6218C73.4795 87.6263 73.4922 87.6331 73.505 87.6422C73.5157 87.6513 73.5264 87.6603 73.537 87.6694C73.5754 87.7125 73.5988 87.7715 73.5988 87.8304C73.5988 87.8894 73.5754 87.9483 73.537 87.9914Z" fill="#D73A49"/>
+<path d="M82.1393 85.9021H80.9167V85.2374H84.0621V85.9021H82.8336V89.451H82.1393V85.9021ZM84.564 89.451V85H85.2168V86.8872C85.3078 86.7369 85.4324 86.6221 85.5907 86.543C85.7489 86.4639 85.925 86.4243 86.1189 86.4243C86.289 86.4243 86.4433 86.454 86.5818 86.5133C86.7242 86.5727 86.8449 86.6558 86.9438 86.7626C87.0427 86.8694 87.1179 87 87.1693 87.1543C87.2247 87.3046 87.2524 87.4748 87.2524 87.6647V89.451H86.5996V87.7715C86.5996 87.5341 86.5442 87.3501 86.4334 87.2196C86.3226 87.085 86.1723 87.0178 85.9824 87.0178C85.7648 87.0178 85.5828 87.1009 85.4364 87.267C85.29 87.4293 85.2168 87.6706 85.2168 87.9911V89.451H84.564ZM88.4141 85.8368C88.2954 85.8368 88.1926 85.7952 88.1055 85.7122C88.0185 85.6251 87.9749 85.5203 87.9749 85.3976C87.9749 85.2789 88.0185 85.178 88.1055 85.0949C88.1926 85.0079 88.2954 84.9644 88.4141 84.9644C88.5368 84.9644 88.6396 85.0079 88.7227 85.0949C88.8058 85.178 88.8473 85.2789 88.8473 85.3976C88.8473 85.5203 88.8058 85.6251 88.7227 85.7122C88.6396 85.7952 88.5368 85.8368 88.4141 85.8368ZM88.0877 86.4837H88.7405V89.451H88.0877V86.4837ZM90.5614 89.5104C90.2963 89.5104 90.0569 89.4589 89.8433 89.356C89.6336 89.2532 89.4753 89.0949 89.3685 88.8813L89.8492 88.5371C89.9085 88.6676 90.0035 88.7685 90.1341 88.8397C90.2686 88.9109 90.411 88.9466 90.5614 88.9466C90.6761 88.9466 90.775 88.9208 90.8581 88.8694C90.9451 88.814 90.9887 88.7349 90.9887 88.632C90.9887 88.545 90.957 88.4738 90.8937 88.4184C90.8304 88.363 90.7097 88.3076 90.5317 88.2522L90.2706 88.181C90.0094 88.1098 89.8136 87.997 89.683 87.8427C89.5525 87.6844 89.4892 87.4945 89.4931 87.273C89.4931 87.1424 89.5208 87.0257 89.5762 86.9228C89.6316 86.816 89.7068 86.727 89.8017 86.6558C89.8967 86.5806 90.0075 86.5232 90.1341 86.4837C90.2646 86.4441 90.4051 86.4243 90.5554 86.4243C90.7809 86.4243 90.9788 86.4678 91.1489 86.5549C91.319 86.638 91.4555 86.7626 91.5584 86.9288L91.1073 87.273C91.0401 87.182 90.959 87.1088 90.864 87.0534C90.773 86.998 90.6662 86.9703 90.5436 86.9703C90.4446 86.9703 90.3536 86.994 90.2706 87.0415C90.1875 87.089 90.1459 87.1582 90.1459 87.2492C90.1459 87.3205 90.1677 87.3857 90.2112 87.4451C90.2587 87.5044 90.3556 87.5559 90.502 87.5994L90.8047 87.6884C91.0658 87.7675 91.2696 87.8763 91.4159 88.0148C91.5623 88.1533 91.6355 88.3452 91.6355 88.5905C91.6355 88.7329 91.6078 88.8615 91.5524 88.9762C91.4971 89.087 91.4219 89.1839 91.3269 89.267C91.232 89.3462 91.1192 89.4075 90.9887 89.451C90.8581 89.4906 90.7157 89.5104 90.5614 89.5104ZM93.7094 85H94.3622V89.451H93.7094V85ZM96.5807 89.5104C96.3591 89.5104 96.1534 89.4708 95.9635 89.3917C95.7775 89.3125 95.6133 89.2037 95.4709 89.0652C95.3324 88.9228 95.2236 88.7586 95.1445 88.5727C95.0654 88.3828 95.0258 88.181 95.0258 87.9673C95.0258 87.7537 95.0654 87.5539 95.1445 87.3679C95.2236 87.178 95.3324 87.0138 95.4709 86.8754C95.6133 86.7329 95.7775 86.6221 95.9635 86.543C96.1534 86.4639 96.3591 86.4243 96.5807 86.4243C96.7983 86.4243 97.0021 86.4639 97.192 86.543C97.3819 86.6221 97.5461 86.7329 97.6845 86.8754C97.827 87.0138 97.9378 87.178 98.0169 87.3679C98.096 87.5539 98.1356 87.7537 98.1356 87.9673C98.1356 88.181 98.096 88.3828 98.0169 88.5727C97.9378 88.7586 97.827 88.9228 97.6845 89.0652C97.5461 89.2037 97.3819 89.3125 97.192 89.3917C97.0021 89.4708 96.7983 89.5104 96.5807 89.5104ZM96.5807 88.905C96.7113 88.905 96.83 88.8813 96.9368 88.8338C97.0476 88.7863 97.1425 88.721 97.2216 88.638C97.3008 88.5509 97.3621 88.45 97.4056 88.3353C97.4491 88.2205 97.4709 88.0979 97.4709 87.9673C97.4709 87.8368 97.4491 87.7141 97.4056 87.5994C97.3621 87.4846 97.3008 87.3857 97.2216 87.3027C97.1425 87.2156 97.0476 87.1483 96.9368 87.1009C96.83 87.0534 96.7113 87.0297 96.5807 87.0297C96.4501 87.0297 96.3295 87.0534 96.2187 87.1009C96.1079 87.1483 96.0129 87.2156 95.9338 87.3027C95.8547 87.3857 95.7934 87.4846 95.7498 87.5994C95.7063 87.7141 95.6846 87.8368 95.6846 87.9673C95.6846 88.0979 95.7063 88.2205 95.7498 88.3353C95.7934 88.45 95.8547 88.5509 95.9338 88.638C96.0129 88.721 96.1079 88.7863 96.2187 88.8338C96.3295 88.8813 96.4501 88.905 96.5807 88.905ZM100.133 89.5104C99.9118 89.5104 99.7061 89.4708 99.5162 89.3917C99.3302 89.3125 99.166 89.2037 99.0236 89.0652C98.8851 88.9228 98.7763 88.7586 98.6972 88.5727C98.6181 88.3828 98.5785 88.181 98.5785 87.9673C98.5785 87.7537 98.6181 87.5539 98.6972 87.3679C98.7763 87.178 98.8851 87.0138 99.0236 86.8754C99.166 86.7329 99.3302 86.6221 99.5162 86.543C99.7061 86.4639 99.9118 86.4243 100.133 86.4243C100.351 86.4243 100.555 86.4639 100.745 86.543C100.935 86.6221 101.099 86.7329 101.237 86.8754C101.38 87.0138 101.49 87.178 101.57 87.3679C101.649 87.5539 101.688 87.7537 101.688 87.9673C101.688 88.181 101.649 88.3828 101.57 88.5727C101.49 88.7586 101.38 88.9228 101.237 89.0652C101.099 89.2037 100.935 89.3125 100.745 89.3917C100.555 89.4708 100.351 89.5104 100.133 89.5104ZM100.133 88.905C100.264 88.905 100.383 88.8813 100.489 88.8338C100.6 88.7863 100.695 88.721 100.774 88.638C100.853 88.5509 100.915 88.45 100.958 88.3353C101.002 88.2205 101.024 88.0979 101.024 87.9673C101.024 87.8368 101.002 87.7141 100.958 87.5994C100.915 87.4846 100.853 87.3857 100.774 87.3027C100.695 87.2156 100.6 87.1483 100.489 87.1009C100.383 87.0534 100.264 87.0297 100.133 87.0297C100.003 87.0297 99.8822 87.0534 99.7714 87.1009C99.6606 87.1483 99.5656 87.2156 99.4865 87.3027C99.4074 87.3857 99.3461 87.4846 99.3025 87.5994C99.259 87.7141 99.2373 87.8368 99.2373 87.9673C99.2373 88.0979 99.259 88.2205 99.3025 88.3353C99.3461 88.45 99.4074 88.5509 99.4865 88.638C99.5656 88.721 99.6606 88.7863 99.7714 88.8338C99.8822 88.8813 100.003 88.905 100.133 88.905ZM102.998 88.0207V89.451H102.345V85H102.998V87.6113L104.131 86.4837H104.956L103.633 87.8071L105.253 89.451H104.416L102.998 88.0207ZM106.482 89.5104C106.217 89.5104 105.977 89.4589 105.764 89.356C105.554 89.2532 105.396 89.0949 105.289 88.8813L105.77 88.5371C105.829 88.6676 105.924 88.7685 106.055 88.8397C106.189 88.9109 106.331 88.9466 106.482 88.9466C106.597 88.9466 106.695 88.9208 106.779 88.8694C106.866 88.814 106.909 88.7349 106.909 88.632C106.909 88.545 106.877 88.4738 106.814 88.4184C106.751 88.363 106.63 88.3076 106.452 88.2522L106.191 88.181C105.93 88.1098 105.734 87.997 105.603 87.8427C105.473 87.6844 105.41 87.4945 105.414 87.273C105.414 87.1424 105.441 87.0257 105.497 86.9228C105.552 86.816 105.627 86.727 105.722 86.6558C105.817 86.5806 105.928 86.5232 106.055 86.4837C106.185 86.4441 106.326 86.4243 106.476 86.4243C106.701 86.4243 106.899 86.4678 107.069 86.5549C107.239 86.638 107.376 86.7626 107.479 86.9288L107.028 87.273C106.961 87.182 106.879 87.1088 106.784 87.0534C106.693 86.998 106.587 86.9703 106.464 86.9703C106.365 86.9703 106.274 86.994 106.191 87.0415C106.108 87.089 106.066 87.1582 106.066 87.2492C106.066 87.3205 106.088 87.3857 106.132 87.4451C106.179 87.5044 106.276 87.5559 106.422 87.5994L106.725 87.6884C106.986 87.7675 107.19 87.8763 107.336 88.0148C107.483 88.1533 107.556 88.3452 107.556 88.5905C107.556 88.7329 107.528 88.8615 107.473 88.9762C107.418 89.087 107.342 89.1839 107.247 89.267C107.152 89.3462 107.04 89.4075 106.909 89.451C106.779 89.4906 106.636 89.5104 106.482 89.5104ZM109.63 85H110.283V89.451H109.63V85ZM111.486 85.8368C111.368 85.8368 111.265 85.7952 111.178 85.7122C111.091 85.6251 111.047 85.5203 111.047 85.3976C111.047 85.2789 111.091 85.178 111.178 85.0949C111.265 85.0079 111.368 84.9644 111.486 84.9644C111.609 84.9644 111.712 85.0079 111.795 85.0949C111.878 85.178 111.92 85.2789 111.92 85.3976C111.92 85.5203 111.878 85.6251 111.795 85.7122C111.712 85.7952 111.609 85.8368 111.486 85.8368ZM111.16 86.4837H111.813V89.451H111.16V86.4837ZM113.343 88.0207V89.451H112.69V85H113.343V87.6113L114.476 86.4837H115.301L113.978 87.8071L115.598 89.451H114.761L113.343 88.0207ZM117.085 89.5104C116.86 89.5104 116.652 89.4728 116.462 89.3976C116.272 89.3224 116.108 89.2176 115.97 89.0831C115.835 88.9446 115.728 88.7804 115.649 88.5905C115.574 88.4006 115.537 88.1929 115.537 87.9673C115.537 87.7497 115.574 87.548 115.649 87.362C115.728 87.1721 115.835 87.0079 115.97 86.8694C116.108 86.7309 116.272 86.6221 116.462 86.543C116.652 86.4639 116.86 86.4243 117.085 86.4243C117.279 86.4243 117.463 86.456 117.637 86.5193C117.811 86.5826 117.964 86.6775 118.094 86.8041C118.225 86.9268 118.328 87.0811 118.403 87.267C118.478 87.449 118.516 87.6587 118.516 87.8961C118.516 87.9278 118.516 87.9594 118.516 87.9911C118.516 88.0227 118.514 88.0623 118.51 88.1098H116.177C116.185 88.2324 116.213 88.3432 116.261 88.4421C116.312 88.541 116.377 88.6261 116.456 88.6973C116.539 88.7685 116.634 88.8239 116.741 88.8635C116.852 88.8991 116.969 88.9169 117.091 88.9169C117.301 88.9169 117.475 88.8753 117.614 88.7923C117.752 88.7052 117.861 88.5964 117.94 88.4658L118.439 88.8219C118.304 89.0356 118.122 89.2037 117.893 89.3264C117.667 89.449 117.398 89.5104 117.085 89.5104ZM117.857 87.635C117.821 87.4213 117.726 87.2591 117.572 87.1483C117.422 87.0336 117.252 86.9762 117.062 86.9762C116.967 86.9762 116.872 86.9901 116.777 87.0178C116.686 87.0455 116.601 87.087 116.522 87.1424C116.447 87.1978 116.381 87.267 116.326 87.3501C116.27 87.4293 116.231 87.5242 116.207 87.635H117.857ZM121.8 89.5104C121.598 89.5104 121.408 89.4708 121.23 89.3917C121.056 89.3086 120.906 89.1978 120.779 89.0593C120.653 88.9169 120.552 88.7527 120.477 88.5667C120.406 88.3808 120.37 88.181 120.37 87.9673C120.37 87.7537 120.406 87.5539 120.477 87.3679C120.552 87.182 120.653 87.0198 120.779 86.8813C120.906 86.7389 121.056 86.6281 121.23 86.5489C121.408 86.4659 121.598 86.4243 121.8 86.4243C122.014 86.4243 122.204 86.4718 122.37 86.5667C122.54 86.6577 122.667 86.7626 122.75 86.8813V86.4837H123.403V89.451H122.75V89.0534C122.667 89.1721 122.54 89.2789 122.37 89.3739C122.204 89.4649 122.014 89.5104 121.8 89.5104ZM121.919 88.9169C122.049 88.9169 122.168 88.8931 122.275 88.8457C122.386 88.7942 122.479 88.727 122.554 88.6439C122.633 88.5568 122.694 88.456 122.738 88.3412C122.781 88.2265 122.803 88.1019 122.803 87.9673C122.803 87.8328 122.781 87.7082 122.738 87.5934C122.694 87.4787 122.633 87.3798 122.554 87.2967C122.479 87.2097 122.386 87.1424 122.275 87.0949C122.168 87.0435 122.049 87.0178 121.919 87.0178C121.788 87.0178 121.668 87.0435 121.557 87.0949C121.45 87.1424 121.357 87.2097 121.278 87.2967C121.203 87.3798 121.143 87.4787 121.1 87.5934C121.056 87.7082 121.035 87.8328 121.035 87.9673C121.035 88.1019 121.056 88.2265 121.1 88.3412C121.143 88.456 121.203 88.5568 121.278 88.6439C121.357 88.727 121.45 88.7942 121.557 88.8457C121.668 88.8931 121.788 88.9169 121.919 88.9169ZM126.627 89.5104C126.362 89.5104 126.123 89.4589 125.909 89.356C125.699 89.2532 125.541 89.0949 125.434 88.8813L125.915 88.5371C125.974 88.6676 126.069 88.7685 126.2 88.8397C126.335 88.9109 126.477 88.9466 126.627 88.9466C126.742 88.9466 126.841 88.9208 126.924 88.8694C127.011 88.814 127.055 88.7349 127.055 88.632C127.055 88.545 127.023 88.4738 126.96 88.4184C126.896 88.363 126.776 88.3076 126.598 88.2522L126.336 88.181C126.075 88.1098 125.88 87.997 125.749 87.8427C125.618 87.6844 125.555 87.4945 125.559 87.273C125.559 87.1424 125.587 87.0257 125.642 86.9228C125.698 86.816 125.773 86.727 125.868 86.6558C125.963 86.5806 126.073 86.5232 126.2 86.4837C126.331 86.4441 126.471 86.4243 126.621 86.4243C126.847 86.4243 127.045 86.4678 127.215 86.5549C127.385 86.638 127.521 86.7626 127.624 86.9288L127.173 87.273C127.106 87.182 127.025 87.1088 126.93 87.0534C126.839 86.998 126.732 86.9703 126.609 86.9703C126.511 86.9703 126.42 86.994 126.336 87.0415C126.253 87.089 126.212 87.1582 126.212 87.2492C126.212 87.3205 126.234 87.3857 126.277 87.4451C126.325 87.5044 126.422 87.5559 126.568 87.5994L126.871 87.6884C127.132 87.7675 127.335 87.8763 127.482 88.0148C127.628 88.1533 127.701 88.3452 127.701 88.5905C127.701 88.7329 127.674 88.8615 127.618 88.9762C127.563 89.087 127.488 89.1839 127.393 89.267C127.298 89.3462 127.185 89.4075 127.055 89.451C126.924 89.4906 126.782 89.5104 126.627 89.5104ZM129.732 89.5104C129.51 89.5104 129.302 89.4708 129.109 89.3917C128.919 89.3125 128.753 89.2057 128.61 89.0712C128.472 88.9327 128.363 88.7705 128.284 88.5845C128.205 88.3946 128.165 88.1889 128.165 87.9673C128.165 87.7497 128.205 87.546 128.284 87.3561C128.363 87.1662 128.472 87.0039 128.61 86.8694C128.753 86.7309 128.919 86.6221 129.109 86.543C129.302 86.4639 129.51 86.4243 129.732 86.4243C130.04 86.4243 130.315 86.4995 130.557 86.6498C130.802 86.7962 130.988 86.994 131.115 87.2433L130.545 87.5519C130.474 87.4016 130.367 87.2769 130.224 87.178C130.086 87.0791 129.922 87.0297 129.732 87.0297C129.601 87.0297 129.48 87.0534 129.37 87.1009C129.259 87.1483 129.162 87.2156 129.079 87.3027C129 87.3857 128.938 87.4846 128.895 87.5994C128.851 87.7141 128.83 87.8368 128.83 87.9673C128.83 88.0979 128.851 88.2205 128.895 88.3353C128.938 88.45 129 88.5509 129.079 88.638C129.162 88.721 129.259 88.7863 129.37 88.8338C129.48 88.8813 129.601 88.905 129.732 88.905C129.922 88.905 130.086 88.8556 130.224 88.7566C130.367 88.6577 130.474 88.5331 130.545 88.3828L131.115 88.6914C130.988 88.9406 130.802 89.1404 130.557 89.2908C130.315 89.4372 130.04 89.5104 129.732 89.5104ZM132.928 89.5104C132.726 89.5104 132.536 89.4708 132.358 89.3917C132.184 89.3086 132.034 89.1978 131.907 89.0593C131.78 88.9169 131.679 88.7527 131.604 88.5667C131.533 88.3808 131.497 88.181 131.497 87.9673C131.497 87.7537 131.533 87.5539 131.604 87.3679C131.679 87.182 131.78 87.0198 131.907 86.8813C132.034 86.7389 132.184 86.6281 132.358 86.5489C132.536 86.4659 132.726 86.4243 132.928 86.4243C133.141 86.4243 133.331 86.4718 133.497 86.5667C133.668 86.6577 133.794 86.7626 133.877 86.8813V86.4837H134.53V89.451H133.877V89.0534C133.794 89.1721 133.668 89.2789 133.497 89.3739C133.331 89.4649 133.141 89.5104 132.928 89.5104ZM133.046 88.9169C133.177 88.9169 133.296 88.8931 133.402 88.8457C133.513 88.7942 133.606 88.727 133.681 88.6439C133.761 88.5568 133.822 88.456 133.865 88.3412C133.909 88.2265 133.931 88.1019 133.931 87.9673C133.931 87.8328 133.909 87.7082 133.865 87.5934C133.822 87.4787 133.761 87.3798 133.681 87.2967C133.606 87.2097 133.513 87.1424 133.402 87.0949C133.296 87.0435 133.177 87.0178 133.046 87.0178C132.916 87.0178 132.795 87.0435 132.684 87.0949C132.578 87.1424 132.485 87.2097 132.405 87.2967C132.33 87.3798 132.271 87.4787 132.227 87.5934C132.184 87.7082 132.162 87.8328 132.162 87.9673C132.162 88.1019 132.184 88.2265 132.227 88.3412C132.271 88.456 132.33 88.5568 132.405 88.6439C132.485 88.727 132.578 88.7942 132.684 88.8457C132.795 88.8931 132.916 88.9169 133.046 88.9169ZM139.195 87.7834C139.195 87.5499 139.151 87.364 139.064 87.2255C138.977 87.087 138.845 87.0178 138.667 87.0178C138.461 87.0178 138.293 87.0989 138.162 87.2611C138.036 87.4194 137.968 87.6469 137.96 87.9436V89.451H137.308V87.7834C137.308 87.5499 137.264 87.364 137.177 87.2255C137.09 87.087 136.957 87.0178 136.779 87.0178C136.566 87.0178 136.394 87.1028 136.263 87.273C136.133 87.4391 136.067 87.6785 136.067 87.9911V89.451H135.414V86.4837H136.067V86.8872C136.15 86.7487 136.263 86.638 136.406 86.5549C136.552 86.4678 136.72 86.4243 136.91 86.4243C137.132 86.4243 137.319 86.4758 137.474 86.5786C137.632 86.6815 137.751 86.8259 137.83 87.0119C137.917 86.8219 138.047 86.6775 138.222 86.5786C138.396 86.4758 138.582 86.4243 138.779 86.4243C139.116 86.4243 139.377 86.5391 139.563 86.7685C139.753 86.994 139.848 87.2967 139.848 87.6765V89.451H139.195V87.7834Z" fill="#24272A"/>
+<path d="M81.2921 93.7641H81.775V97.451H81.2921V93.7641ZM82.8981 95.2648H82.3476V94.8546H82.8981V94.3301C82.8981 94.1951 82.9171 94.0774 82.9552 93.977C82.9968 93.8766 83.0521 93.7935 83.1214 93.7277C83.1941 93.6585 83.2789 93.6083 83.3758 93.5771C83.4728 93.5425 83.5784 93.5252 83.6926 93.5252C83.7722 93.5252 83.8449 93.5321 83.9107 93.546C83.9765 93.5564 84.0388 93.5719 84.0976 93.5927V93.9874C84.0561 93.9701 84.0042 93.958 83.9419 93.951C83.883 93.9406 83.8276 93.9354 83.7757 93.9354C83.6303 93.9354 83.5212 93.9683 83.4485 94.0341C83.3793 94.0964 83.3447 94.2107 83.3447 94.3768V94.8546H84.0976V95.2648H83.3447V97.451H82.8981V95.2648ZM85.7728 98.5363L86.3388 97.316L85.2016 94.8546H85.6949L86.5881 96.8279L87.4761 94.8546H87.9746L86.2713 98.5363H85.7728ZM89.5175 97.5029C89.3202 97.5029 89.1385 97.4683 88.9723 97.3991C88.8061 97.3264 88.6625 97.2294 88.5413 97.1083C88.4201 96.9871 88.3249 96.8452 88.2557 96.6825C88.1899 96.5163 88.157 96.3397 88.157 96.1528C88.157 95.9659 88.1899 95.791 88.2557 95.6283C88.3249 95.4621 88.4201 95.3185 88.5413 95.1973C88.6625 95.0761 88.8061 94.9809 88.9723 94.9117C89.1385 94.839 89.3202 94.8027 89.5175 94.8027C89.7114 94.8027 89.8914 94.839 90.0576 94.9117C90.2238 94.9809 90.3674 95.0761 90.4886 95.1973C90.6098 95.3185 90.7032 95.4621 90.769 95.6283C90.8383 95.791 90.8729 95.9659 90.8729 96.1528C90.8729 96.3397 90.8383 96.5163 90.769 96.6825C90.7032 96.8452 90.6098 96.9871 90.4886 97.1083C90.3674 97.2294 90.2238 97.3264 90.0576 97.3991C89.8914 97.4683 89.7114 97.5029 89.5175 97.5029ZM89.5175 97.0875C89.6526 97.0875 89.7755 97.0633 89.8862 97.0148C89.997 96.9663 90.0905 96.9006 90.1667 96.8175C90.2463 96.7309 90.3069 96.6323 90.3484 96.5215C90.3934 96.4072 90.4159 96.2843 90.4159 96.1528C90.4159 96.0247 90.3934 95.9035 90.3484 95.7893C90.3069 95.6751 90.2463 95.5764 90.1667 95.4933C90.0905 95.4068 89.997 95.3392 89.8862 95.2908C89.7755 95.2423 89.6526 95.2181 89.5175 95.2181C89.3825 95.2181 89.2596 95.2423 89.1489 95.2908C89.0381 95.3392 88.9429 95.4068 88.8632 95.4933C88.7836 95.5764 88.7213 95.6751 88.6763 95.7893C88.6348 95.9035 88.614 96.0247 88.614 96.1528C88.614 96.2843 88.6348 96.4072 88.6763 96.5215C88.7213 96.6323 88.7836 96.7309 88.8632 96.8175C88.9429 96.9006 89.0381 96.9663 89.1489 97.0148C89.2596 97.0633 89.3825 97.0875 89.5175 97.0875ZM92.433 97.5029C92.2911 97.5029 92.1613 97.4787 92.0436 97.4302C91.9259 97.3783 91.8255 97.3073 91.7424 97.2173C91.6593 97.1273 91.5935 97.0183 91.5451 96.8902C91.5001 96.7586 91.4776 96.6115 91.4776 96.4488V94.8546H91.9241V96.3813C91.9241 96.5994 91.9761 96.7725 92.0799 96.9006C92.1873 97.0287 92.3309 97.0927 92.5109 97.0927C92.6113 97.0927 92.7048 97.0719 92.7914 97.0304C92.8814 96.9854 92.9575 96.9231 93.0198 96.8434C93.0856 96.7604 93.1375 96.66 93.1756 96.5423C93.2137 96.4246 93.2327 96.2913 93.2327 96.1424V94.8546H93.6793V97.451H93.2327V97.0512C93.1462 97.2035 93.032 97.3177 92.89 97.3939C92.7515 97.4666 92.5992 97.5029 92.433 97.5029ZM96.5578 97.5029C96.3258 97.5029 96.1181 97.4545 95.9346 97.3575C95.7512 97.2571 95.6196 97.1048 95.54 96.9006L95.9035 96.698C95.952 96.8296 96.0368 96.9317 96.1579 97.0044C96.2826 97.0737 96.4176 97.1083 96.563 97.1083C96.6876 97.1083 96.7932 97.0789 96.8797 97.02C96.9698 96.9577 97.0148 96.8711 97.0148 96.7604C97.0148 96.6669 96.9819 96.589 96.9161 96.5267C96.8503 96.4644 96.7326 96.4072 96.563 96.3553L96.3033 96.2722C96.0887 96.2099 95.926 96.1147 95.8152 95.9866C95.7079 95.8551 95.6542 95.6976 95.6542 95.5141C95.6542 95.4033 95.6767 95.3046 95.7217 95.2181C95.7702 95.1281 95.8343 95.0536 95.9139 94.9948C95.997 94.9325 96.0922 94.8857 96.1995 94.8546C96.3068 94.82 96.4228 94.8027 96.5474 94.8027C96.7413 94.8027 96.9109 94.8425 97.0563 94.9221C97.2017 94.9983 97.3177 95.109 97.4042 95.2544L97.0719 95.4829C97.013 95.3998 96.9386 95.3306 96.8486 95.2752C96.762 95.2163 96.6565 95.1869 96.5318 95.1869C96.421 95.1869 96.3206 95.2146 96.2306 95.27C96.1441 95.3254 96.1008 95.4016 96.1008 95.4985C96.1008 95.5781 96.1251 95.6491 96.1735 95.7114C96.2254 95.7737 96.3241 95.8274 96.4695 95.8724L96.7551 95.9607C96.9801 96.0299 97.1532 96.1251 97.2744 96.2463C97.399 96.3674 97.4613 96.5267 97.4613 96.724C97.4613 96.8486 97.4388 96.9594 97.3938 97.0563C97.3488 97.1533 97.2848 97.2346 97.2017 97.3004C97.1221 97.3662 97.0269 97.4164 96.9161 97.451C96.8053 97.4856 96.6859 97.5029 96.5578 97.5029ZM98.3399 94.1587C98.2499 94.1587 98.1738 94.1293 98.1115 94.0705C98.0491 94.0081 98.018 93.932 98.018 93.842C98.018 93.7554 98.0491 93.681 98.1115 93.6187C98.1738 93.5564 98.2499 93.5252 98.3399 93.5252C98.43 93.5252 98.5044 93.5564 98.5632 93.6187C98.6221 93.681 98.6515 93.7554 98.6515 93.842C98.6515 93.932 98.6221 94.0081 98.5632 94.0705C98.5044 94.1293 98.43 94.1587 98.3399 94.1587ZM98.1115 94.8546H98.558V97.451H98.1115V94.8546ZM100.537 97.0304C100.665 97.0304 100.782 97.0079 100.89 96.9629C101.001 96.9179 101.094 96.8556 101.17 96.7759C101.246 96.6928 101.305 96.5959 101.347 96.4851C101.392 96.3744 101.414 96.2532 101.414 96.1216C101.414 95.9935 101.392 95.8741 101.347 95.7633C101.305 95.6491 101.246 95.5522 101.17 95.4725C101.094 95.3929 101.001 95.3306 100.89 95.2856C100.782 95.2371 100.665 95.2129 100.537 95.2129C100.405 95.2129 100.286 95.2371 100.178 95.2856C100.071 95.3306 99.9793 95.3929 99.9031 95.4725C99.827 95.5522 99.7664 95.6491 99.7214 95.7633C99.6798 95.8741 99.6591 95.9935 99.6591 96.1216C99.6591 96.2532 99.6798 96.3744 99.7214 96.4851C99.7664 96.5959 99.827 96.6928 99.9031 96.7759C99.9793 96.8556 100.071 96.9179 100.178 96.9629C100.286 97.0079 100.405 97.0304 100.537 97.0304ZM100.511 98.5882C100.23 98.5882 99.9845 98.5363 99.7733 98.4325C99.5621 98.3286 99.4011 98.204 99.2904 98.0586L99.6019 97.747C99.7058 97.8785 99.8321 97.9841 99.981 98.0638C100.133 98.1434 100.31 98.1832 100.511 98.1832C100.621 98.1832 100.729 98.1659 100.833 98.1313C100.936 98.0966 101.028 98.0413 101.108 97.9651C101.191 97.8924 101.257 97.7989 101.305 97.6847C101.354 97.5739 101.378 97.4406 101.378 97.2848V96.9888C101.288 97.1204 101.163 97.2294 101.004 97.316C100.845 97.4025 100.668 97.4458 100.474 97.4458C100.294 97.4458 100.126 97.4129 99.9706 97.3471C99.8148 97.2779 99.6798 97.1844 99.5656 97.0667C99.4513 96.9456 99.3613 96.8054 99.2956 96.6461C99.2332 96.4834 99.2021 96.3086 99.2021 96.1216C99.2021 95.9382 99.2332 95.7668 99.2956 95.6075C99.3613 95.4448 99.4513 95.3046 99.5656 95.1869C99.6798 95.0658 99.8148 94.9723 99.9706 94.9065C100.126 94.8373 100.294 94.8027 100.474 94.8027C100.668 94.8027 100.845 94.8459 101.004 94.9325C101.163 95.0156 101.288 95.1229 101.378 95.2544V94.8546H101.824V97.3004C101.824 97.5185 101.79 97.7072 101.721 97.8664C101.655 98.0291 101.563 98.1624 101.445 98.2663C101.328 98.3736 101.189 98.4532 101.03 98.5052C100.871 98.5605 100.698 98.5882 100.511 98.5882ZM102.665 94.8546H103.112V95.2544C103.202 95.0986 103.32 94.9844 103.465 94.9117C103.61 94.839 103.768 94.8027 103.938 94.8027C104.083 94.8027 104.216 94.8269 104.337 94.8754C104.459 94.9238 104.561 94.9948 104.644 95.0883C104.73 95.1783 104.798 95.289 104.846 95.4206C104.895 95.5487 104.919 95.6924 104.919 95.8516V97.451H104.478V95.9191C104.478 95.701 104.421 95.5297 104.306 95.405C104.196 95.2769 104.048 95.2129 103.865 95.2129C103.761 95.2129 103.662 95.2337 103.569 95.2752C103.479 95.3167 103.399 95.3791 103.33 95.4621C103.264 95.5418 103.211 95.6404 103.169 95.7581C103.131 95.8758 103.112 96.0109 103.112 96.1632V97.451H102.665V94.8546ZM107.897 97.477C107.783 97.477 107.677 97.4614 107.58 97.4302C107.483 97.3956 107.398 97.3471 107.326 97.2848C107.257 97.2191 107.201 97.136 107.16 97.0356C107.122 96.9352 107.103 96.8175 107.103 96.6825V95.2648H106.552V94.8546H107.103V94.1328H107.549V94.8546H108.297V95.2648H107.549V96.6253C107.549 96.7915 107.585 96.9075 107.658 96.9733C107.731 97.0356 107.838 97.0667 107.98 97.0667C108.035 97.0667 108.091 97.0633 108.146 97.0563C108.205 97.046 108.255 97.0321 108.297 97.0148V97.4147C108.241 97.432 108.181 97.4458 108.115 97.4562C108.049 97.47 107.977 97.477 107.897 97.477ZM108.867 97.451V93.5564H109.314V95.2544C109.404 95.0986 109.522 94.9844 109.667 94.9117C109.812 94.839 109.97 94.8027 110.14 94.8027C110.285 94.8027 110.418 94.8269 110.539 94.8754C110.661 94.9238 110.763 94.9948 110.846 95.0883C110.932 95.1783 111 95.289 111.048 95.4206C111.097 95.5487 111.121 95.6924 111.121 95.8516V97.451H110.68V95.9191C110.68 95.701 110.623 95.5297 110.508 95.405C110.398 95.2769 110.25 95.2129 110.067 95.2129C109.963 95.2129 109.864 95.2337 109.771 95.2752C109.681 95.3167 109.601 95.3791 109.532 95.4621C109.466 95.5418 109.413 95.6404 109.371 95.7581C109.333 95.8758 109.314 96.0109 109.314 96.1632V97.451H108.867ZM112.154 94.1587C112.064 94.1587 111.988 94.1293 111.925 94.0705C111.863 94.0081 111.832 93.932 111.832 93.842C111.832 93.7554 111.863 93.681 111.925 93.6187C111.988 93.5564 112.064 93.5252 112.154 93.5252C112.244 93.5252 112.318 93.5564 112.377 93.6187C112.436 93.681 112.465 93.7554 112.465 93.842C112.465 93.932 112.436 94.0081 112.377 94.0705C112.318 94.1293 112.244 94.1587 112.154 94.1587ZM111.925 94.8546H112.372V97.451H111.925V94.8546ZM114.002 97.5029C113.771 97.5029 113.563 97.4545 113.379 97.3575C113.196 97.2571 113.064 97.1048 112.985 96.9006L113.348 96.698C113.397 96.8296 113.481 96.9317 113.603 97.0044C113.727 97.0737 113.862 97.1083 114.008 97.1083C114.132 97.1083 114.238 97.0789 114.324 97.02C114.414 96.9577 114.459 96.8711 114.459 96.7604C114.459 96.6669 114.427 96.589 114.361 96.5267C114.295 96.4644 114.177 96.4072 114.008 96.3553L113.748 96.2722C113.533 96.2099 113.371 96.1147 113.26 95.9866C113.153 95.8551 113.099 95.6976 113.099 95.5141C113.099 95.4033 113.121 95.3046 113.166 95.2181C113.215 95.1281 113.279 95.0536 113.359 94.9948C113.442 94.9325 113.537 94.8857 113.644 94.8546C113.752 94.82 113.867 94.8027 113.992 94.8027C114.186 94.8027 114.356 94.8425 114.501 94.9221C114.646 94.9983 114.762 95.109 114.849 95.2544L114.517 95.4829C114.458 95.3998 114.383 95.3306 114.293 95.2752C114.207 95.2163 114.101 95.1869 113.977 95.1869C113.866 95.1869 113.765 95.2146 113.675 95.27C113.589 95.3254 113.546 95.4016 113.546 95.4985C113.546 95.5781 113.57 95.6491 113.618 95.7114C113.67 95.7737 113.769 95.8274 113.914 95.8724L114.2 95.9607C114.425 96.0299 114.598 96.1251 114.719 96.2463C114.844 96.3674 114.906 96.5267 114.906 96.724C114.906 96.8486 114.884 96.9594 114.839 97.0563C114.794 97.1533 114.729 97.2346 114.646 97.3004C114.567 97.3662 114.472 97.4164 114.361 97.451C114.25 97.4856 114.131 97.5029 114.002 97.5029ZM116.809 94.8546H117.255V95.3583C117.28 95.2752 117.318 95.2008 117.37 95.135C117.421 95.0692 117.48 95.0138 117.546 94.9688C117.612 94.9238 117.681 94.8892 117.754 94.865C117.83 94.8407 117.906 94.8286 117.982 94.8286C118.052 94.8286 118.119 94.8355 118.185 94.8494V95.3116C118.143 95.2942 118.103 95.2839 118.065 95.2804C118.027 95.2735 117.986 95.27 117.941 95.27C117.858 95.27 117.775 95.289 117.692 95.3271C117.612 95.3617 117.539 95.4154 117.473 95.4881C117.411 95.5608 117.359 95.6543 117.318 95.7685C117.276 95.8793 117.255 96.0109 117.255 96.1632V97.451H116.809V94.8546ZM119.762 97.5029C119.561 97.5029 119.377 97.4683 119.211 97.3991C119.045 97.3298 118.903 97.2346 118.785 97.1135C118.668 96.9923 118.576 96.8504 118.51 96.6877C118.448 96.5215 118.417 96.3432 118.417 96.1528C118.417 95.9624 118.45 95.7858 118.515 95.6231C118.581 95.457 118.673 95.3133 118.791 95.1921C118.912 95.071 119.055 94.9757 119.222 94.9065C119.388 94.8373 119.569 94.8027 119.767 94.8027C119.936 94.8027 120.096 94.8321 120.245 94.8909C120.393 94.9463 120.523 95.0311 120.634 95.1454C120.748 95.2562 120.838 95.3929 120.904 95.5556C120.97 95.7149 121.003 95.8983 121.003 96.1061C121.003 96.1303 121.003 96.1528 121.003 96.1736C121.003 96.1909 121.001 96.2134 120.997 96.2411H118.868C118.872 96.3622 118.896 96.4747 118.941 96.5786C118.99 96.6825 119.052 96.7725 119.128 96.8486C119.208 96.9248 119.301 96.9854 119.408 97.0304C119.519 97.0719 119.639 97.0927 119.767 97.0927C119.968 97.0927 120.132 97.0529 120.26 96.9733C120.392 96.8902 120.497 96.7794 120.577 96.6409L120.93 96.885C120.812 97.0754 120.655 97.226 120.457 97.3368C120.264 97.4475 120.032 97.5029 119.762 97.5029ZM120.546 95.8776C120.528 95.7703 120.495 95.6751 120.447 95.592C120.402 95.5089 120.343 95.4379 120.27 95.3791C120.201 95.3202 120.122 95.2752 120.032 95.244C119.942 95.2129 119.848 95.1973 119.751 95.1973C119.654 95.1973 119.559 95.2129 119.466 95.244C119.372 95.2752 119.287 95.3202 119.211 95.3791C119.135 95.4344 119.069 95.5054 119.014 95.592C118.958 95.6751 118.92 95.7703 118.9 95.8776H120.546ZM123.62 98.5363V97.0512C123.534 97.1758 123.409 97.2831 123.246 97.3731C123.084 97.4597 122.904 97.5029 122.706 97.5029C122.523 97.5029 122.353 97.4683 122.197 97.3991C122.045 97.3264 121.912 97.2294 121.797 97.1083C121.683 96.9836 121.593 96.84 121.527 96.6773C121.465 96.5146 121.434 96.3397 121.434 96.1528C121.434 95.9659 121.465 95.791 121.527 95.6283C121.593 95.4656 121.683 95.3237 121.797 95.2025C121.912 95.0779 122.045 94.9809 122.197 94.9117C122.353 94.839 122.523 94.8027 122.706 94.8027C122.904 94.8027 123.084 94.8477 123.246 94.9377C123.409 95.0242 123.534 95.1298 123.62 95.2544V94.8546H124.067V98.5363H123.62ZM122.774 97.0927C122.905 97.0927 123.025 97.0685 123.132 97.02C123.239 96.9715 123.331 96.9058 123.407 96.8227C123.487 96.7361 123.547 96.6357 123.589 96.5215C123.634 96.4072 123.656 96.2843 123.656 96.1528C123.656 96.0212 123.634 95.8983 123.589 95.7841C123.547 95.6699 123.487 95.5712 123.407 95.4881C123.331 95.4016 123.239 95.3341 123.132 95.2856C123.025 95.2371 122.905 95.2129 122.774 95.2129C122.642 95.2129 122.521 95.2371 122.41 95.2856C122.303 95.3341 122.209 95.4016 122.13 95.4881C122.054 95.5712 121.993 95.6699 121.948 95.7841C121.906 95.8983 121.886 96.0212 121.886 96.1528C121.886 96.2843 121.906 96.4072 121.948 96.5215C121.993 96.6357 122.054 96.7361 122.13 96.8227C122.209 96.9058 122.303 96.9715 122.41 97.02C122.521 97.0685 122.642 97.0927 122.774 97.0927ZM125.826 97.5029C125.685 97.5029 125.555 97.4787 125.437 97.4302C125.319 97.3783 125.219 97.3073 125.136 97.2173C125.053 97.1273 124.987 97.0183 124.939 96.8902C124.894 96.7586 124.871 96.6115 124.871 96.4488V94.8546H125.318V96.3813C125.318 96.5994 125.37 96.7725 125.473 96.9006C125.581 97.0287 125.724 97.0927 125.904 97.0927C126.005 97.0927 126.098 97.0719 126.185 97.0304C126.275 96.9854 126.351 96.9231 126.413 96.8434C126.479 96.7604 126.531 96.66 126.569 96.5423C126.607 96.4246 126.626 96.2913 126.626 96.1424V94.8546H127.073V97.451H126.626V97.0512C126.54 97.2035 126.425 97.3177 126.283 97.3939C126.145 97.4666 125.993 97.5029 125.826 97.5029ZM129.057 97.5029C128.856 97.5029 128.673 97.4683 128.507 97.3991C128.34 97.3298 128.198 97.2346 128.081 97.1135C127.963 96.9923 127.871 96.8504 127.805 96.6877C127.743 96.5215 127.712 96.3432 127.712 96.1528C127.712 95.9624 127.745 95.7858 127.811 95.6231C127.876 95.457 127.968 95.3133 128.086 95.1921C128.207 95.071 128.351 94.9757 128.517 94.9065C128.683 94.8373 128.865 94.8027 129.062 94.8027C129.232 94.8027 129.391 94.8321 129.54 94.8909C129.689 94.9463 129.819 95.0311 129.929 95.1454C130.044 95.2562 130.134 95.3929 130.199 95.5556C130.265 95.7149 130.298 95.8983 130.298 96.1061C130.298 96.1303 130.298 96.1528 130.298 96.1736C130.298 96.1909 130.296 96.2134 130.293 96.2411H128.164C128.167 96.3622 128.191 96.4747 128.236 96.5786C128.285 96.6825 128.347 96.7725 128.423 96.8486C128.503 96.9248 128.597 96.9854 128.704 97.0304C128.815 97.0719 128.934 97.0927 129.062 97.0927C129.263 97.0927 129.427 97.0529 129.555 96.9733C129.687 96.8902 129.793 96.7794 129.872 96.6409L130.225 96.885C130.108 97.0754 129.95 97.226 129.753 97.3368C129.559 97.4475 129.327 97.5029 129.057 97.5029ZM129.841 95.8776C129.824 95.7703 129.791 95.6751 129.742 95.592C129.697 95.5089 129.639 95.4379 129.566 95.3791C129.497 95.3202 129.417 95.2752 129.327 95.244C129.237 95.2129 129.144 95.1973 129.047 95.1973C128.95 95.1973 128.854 95.2129 128.761 95.244C128.667 95.2752 128.583 95.3202 128.507 95.3791C128.43 95.4344 128.365 95.5054 128.309 95.592C128.254 95.6751 128.216 95.7703 128.195 95.8776H129.841ZM131.716 97.5029C131.484 97.5029 131.276 97.4545 131.093 97.3575C130.909 97.2571 130.778 97.1048 130.698 96.9006L131.062 96.698C131.11 96.8296 131.195 96.9317 131.316 97.0044C131.441 97.0737 131.576 97.1083 131.721 97.1083C131.846 97.1083 131.951 97.0789 132.038 97.02C132.128 96.9577 132.173 96.8711 132.173 96.7604C132.173 96.6669 132.14 96.589 132.074 96.5267C132.009 96.4644 131.891 96.4072 131.721 96.3553L131.462 96.2722C131.247 96.2099 131.084 96.1147 130.973 95.9866C130.866 95.8551 130.812 95.6976 130.812 95.5141C130.812 95.4033 130.835 95.3046 130.88 95.2181C130.928 95.1281 130.992 95.0536 131.072 94.9948C131.155 94.9325 131.25 94.8857 131.358 94.8546C131.465 94.82 131.581 94.8027 131.706 94.8027C131.899 94.8027 132.069 94.8425 132.214 94.9221C132.36 94.9983 132.476 95.109 132.562 95.2544L132.23 95.4829C132.171 95.3998 132.097 95.3306 132.007 95.2752C131.92 95.2163 131.815 95.1869 131.69 95.1869C131.579 95.1869 131.479 95.2146 131.389 95.27C131.302 95.3254 131.259 95.4016 131.259 95.4985C131.259 95.5781 131.283 95.6491 131.332 95.7114C131.384 95.7737 131.482 95.8274 131.628 95.8724L131.913 95.9607C132.138 96.0299 132.311 96.1251 132.433 96.2463C132.557 96.3674 132.62 96.5267 132.62 96.724C132.62 96.8486 132.597 96.9594 132.552 97.0563C132.507 97.1533 132.443 97.2346 132.36 97.3004C132.28 97.3662 132.185 97.4164 132.074 97.451C131.964 97.4856 131.844 97.5029 131.716 97.5029ZM134.252 97.477C134.137 97.477 134.032 97.4614 133.935 97.4302C133.838 97.3956 133.753 97.3471 133.681 97.2848C133.611 97.2191 133.556 97.136 133.514 97.0356C133.476 96.9352 133.457 96.8175 133.457 96.6825V95.2648H132.907V94.8546H133.457V94.1328H133.904V94.8546H134.652V95.2648H133.904V96.6253C133.904 96.7915 133.94 96.9075 134.013 96.9733C134.086 97.0356 134.193 97.0667 134.335 97.0667C134.39 97.0667 134.446 97.0633 134.501 97.0563C134.56 97.046 134.61 97.0321 134.652 97.0148V97.4147C134.596 97.432 134.536 97.4458 134.47 97.4562C134.404 97.47 134.331 97.477 134.252 97.477ZM135.243 98.1936H134.947L135.295 97.451C135.232 97.4198 135.18 97.3748 135.139 97.316C135.101 97.2537 135.082 97.1827 135.082 97.1031C135.082 96.9992 135.118 96.9092 135.191 96.8331C135.267 96.7534 135.359 96.7136 135.466 96.7136C135.573 96.7136 135.663 96.7534 135.736 96.8331C135.812 96.9092 135.85 96.9992 135.85 97.1031C135.85 97.1481 135.843 97.1896 135.83 97.2277C135.816 97.2658 135.798 97.3021 135.778 97.3368L135.243 98.1936ZM137.874 98.5363L138.44 97.316L137.302 94.8546H137.796L138.689 96.8279L139.577 94.8546H140.075L138.372 98.5363H137.874ZM141.618 97.5029C141.421 97.5029 141.239 97.4683 141.073 97.3991C140.907 97.3264 140.763 97.2294 140.642 97.1083C140.521 96.9871 140.426 96.8452 140.357 96.6825C140.291 96.5163 140.258 96.3397 140.258 96.1528C140.258 95.9659 140.291 95.791 140.357 95.6283C140.426 95.4621 140.521 95.3185 140.642 95.1973C140.763 95.0761 140.907 94.9809 141.073 94.9117C141.239 94.839 141.421 94.8027 141.618 94.8027C141.812 94.8027 141.992 94.839 142.158 94.9117C142.325 94.9809 142.468 95.0761 142.589 95.1973C142.711 95.3185 142.804 95.4621 142.87 95.6283C142.939 95.791 142.974 95.9659 142.974 96.1528C142.974 96.3397 142.939 96.5163 142.87 96.6825C142.804 96.8452 142.711 96.9871 142.589 97.1083C142.468 97.2294 142.325 97.3264 142.158 97.3991C141.992 97.4683 141.812 97.5029 141.618 97.5029ZM141.618 97.0875C141.753 97.0875 141.876 97.0633 141.987 97.0148C142.098 96.9663 142.191 96.9006 142.268 96.8175C142.347 96.7309 142.408 96.6323 142.449 96.5215C142.494 96.4072 142.517 96.2843 142.517 96.1528C142.517 96.0247 142.494 95.9035 142.449 95.7893C142.408 95.6751 142.347 95.5764 142.268 95.4933C142.191 95.4068 142.098 95.3392 141.987 95.2908C141.876 95.2423 141.753 95.2181 141.618 95.2181C141.483 95.2181 141.36 95.2423 141.25 95.2908C141.139 95.3392 141.044 95.4068 140.964 95.4933C140.884 95.5764 140.822 95.6751 140.777 95.7893C140.736 95.9035 140.715 96.0247 140.715 96.1528C140.715 96.2843 140.736 96.4072 140.777 96.5215C140.822 96.6323 140.884 96.7309 140.964 96.8175C141.044 96.9006 141.139 96.9663 141.25 97.0148C141.36 97.0633 141.483 97.0875 141.618 97.0875ZM144.534 97.5029C144.392 97.5029 144.262 97.4787 144.144 97.4302C144.027 97.3783 143.926 97.3073 143.843 97.2173C143.76 97.1273 143.694 97.0183 143.646 96.8902C143.601 96.7586 143.578 96.6115 143.578 96.4488V94.8546H144.025V96.3813C144.025 96.5994 144.077 96.7725 144.181 96.9006C144.288 97.0287 144.432 97.0927 144.612 97.0927C144.712 97.0927 144.806 97.0719 144.892 97.0304C144.982 96.9854 145.058 96.9231 145.121 96.8434C145.186 96.7604 145.238 96.66 145.276 96.5423C145.315 96.4246 145.334 96.2913 145.334 96.1424V94.8546H145.78V97.451H145.334V97.0512C145.247 97.2035 145.133 97.3177 144.991 97.3939C144.852 97.4666 144.7 97.5029 144.534 97.5029ZM151.219 95.9243C151.219 95.7131 151.175 95.5418 151.089 95.4102C151.002 95.2787 150.874 95.2129 150.705 95.2129C150.497 95.2129 150.327 95.2942 150.196 95.457C150.068 95.6197 150 95.8412 149.993 96.1216V97.451H149.547V95.9243C149.547 95.7131 149.503 95.5418 149.417 95.4102C149.334 95.2787 149.207 95.2129 149.038 95.2129C148.827 95.2129 148.653 95.2977 148.518 95.4673C148.387 95.637 148.321 95.8689 148.321 96.1632V97.451H147.875V94.8546H148.321V95.2544C148.397 95.116 148.503 95.0069 148.638 94.9273C148.773 94.8442 148.929 94.8027 149.105 94.8027C149.299 94.8027 149.464 94.8529 149.599 94.9532C149.737 95.0502 149.839 95.1852 149.905 95.3583C149.974 95.1887 150.083 95.0536 150.232 94.9532C150.384 94.8529 150.559 94.8027 150.757 94.8027C150.898 94.8027 151.025 94.8286 151.136 94.8805C151.25 94.929 151.345 95 151.421 95.0935C151.501 95.1835 151.561 95.2942 151.603 95.4258C151.645 95.5539 151.665 95.6976 151.665 95.8568V97.451H151.219V95.9243ZM153.539 97.5029C153.355 97.5029 153.186 97.4683 153.03 97.3991C152.877 97.3264 152.744 97.2294 152.63 97.1083C152.516 96.9836 152.426 96.84 152.36 96.6773C152.298 96.5146 152.266 96.3397 152.266 96.1528C152.266 95.9659 152.298 95.791 152.36 95.6283C152.426 95.4656 152.516 95.3237 152.63 95.2025C152.744 95.0779 152.877 94.9809 153.03 94.9117C153.186 94.839 153.355 94.8027 153.539 94.8027C153.736 94.8027 153.916 94.8477 154.079 94.9377C154.241 95.0242 154.366 95.1298 154.453 95.2544V94.8546H154.899V97.451H154.453V97.0512C154.366 97.1758 154.241 97.2831 154.079 97.3731C153.916 97.4597 153.736 97.5029 153.539 97.5029ZM153.606 97.0927C153.738 97.0927 153.857 97.0685 153.965 97.02C154.072 96.9715 154.164 96.9058 154.24 96.8227C154.319 96.7361 154.38 96.6357 154.421 96.5215C154.466 96.4072 154.489 96.2843 154.489 96.1528C154.489 96.0212 154.466 95.8983 154.421 95.7841C154.38 95.6699 154.319 95.5712 154.24 95.4881C154.164 95.4016 154.072 95.3341 153.965 95.2856C153.857 95.2371 153.738 95.2129 153.606 95.2129C153.475 95.2129 153.353 95.2371 153.243 95.2856C153.135 95.3341 153.042 95.4016 152.962 95.4881C152.886 95.5712 152.826 95.6699 152.781 95.7841C152.739 95.8983 152.718 96.0212 152.718 96.1528C152.718 96.2843 152.739 96.4072 152.781 96.5215C152.826 96.6357 152.886 96.7361 152.962 96.8227C153.042 96.9058 153.135 96.9715 153.243 97.02C153.353 97.0685 153.475 97.0927 153.606 97.0927ZM155.932 98.5363L156.498 97.316L155.361 94.8546H155.854L156.747 96.8279L157.635 94.8546H158.134L156.431 98.5363H155.932ZM159.716 93.5564H160.162V97.451H159.716V93.5564ZM162.162 97.5029C161.964 97.5029 161.783 97.4683 161.616 97.3991C161.45 97.3264 161.307 97.2294 161.185 97.1083C161.064 96.9871 160.969 96.8452 160.9 96.6825C160.834 96.5163 160.801 96.3397 160.801 96.1528C160.801 95.9659 160.834 95.791 160.9 95.6283C160.969 95.4621 161.064 95.3185 161.185 95.1973C161.307 95.0761 161.45 94.9809 161.616 94.9117C161.783 94.839 161.964 94.8027 162.162 94.8027C162.355 94.8027 162.535 94.839 162.702 94.9117C162.868 94.9809 163.011 95.0761 163.133 95.1973C163.254 95.3185 163.347 95.4621 163.413 95.6283C163.482 95.791 163.517 95.9659 163.517 96.1528C163.517 96.3397 163.482 96.5163 163.413 96.6825C163.347 96.8452 163.254 96.9871 163.133 97.1083C163.011 97.2294 162.868 97.3264 162.702 97.3991C162.535 97.4683 162.355 97.5029 162.162 97.5029ZM162.162 97.0875C162.297 97.0875 162.42 97.0633 162.53 97.0148C162.641 96.9663 162.735 96.9006 162.811 96.8175C162.89 96.7309 162.951 96.6323 162.992 96.5215C163.037 96.4072 163.06 96.2843 163.06 96.1528C163.06 96.0247 163.037 95.9035 162.992 95.7893C162.951 95.6751 162.89 95.5764 162.811 95.4933C162.735 95.4068 162.641 95.3392 162.53 95.2908C162.42 95.2423 162.297 95.2181 162.162 95.2181C162.027 95.2181 161.904 95.2423 161.793 95.2908C161.682 95.3392 161.587 95.4068 161.507 95.4933C161.428 95.5764 161.365 95.6751 161.32 95.7893C161.279 95.9035 161.258 96.0247 161.258 96.1528C161.258 96.2843 161.279 96.4072 161.32 96.5215C161.365 96.6323 161.428 96.7309 161.507 96.8175C161.587 96.9006 161.682 96.9663 161.793 97.0148C161.904 97.0633 162.027 97.0875 162.162 97.0875ZM164.937 97.5029C164.705 97.5029 164.497 97.4545 164.314 97.3575C164.13 97.2571 163.999 97.1048 163.919 96.9006L164.283 96.698C164.331 96.8296 164.416 96.9317 164.537 97.0044C164.662 97.0737 164.797 97.1083 164.942 97.1083C165.067 97.1083 165.172 97.0789 165.259 97.02C165.349 96.9577 165.394 96.8711 165.394 96.7604C165.394 96.6669 165.361 96.589 165.295 96.5267C165.23 96.4644 165.112 96.4072 164.942 96.3553L164.683 96.2722C164.468 96.2099 164.305 96.1147 164.194 95.9866C164.087 95.8551 164.033 95.6976 164.033 95.5141C164.033 95.4033 164.056 95.3046 164.101 95.2181C164.149 95.1281 164.213 95.0536 164.293 94.9948C164.376 94.9325 164.471 94.8857 164.579 94.8546C164.686 94.82 164.802 94.8027 164.927 94.8027C165.12 94.8027 165.29 94.8425 165.436 94.9221C165.581 94.9983 165.697 95.109 165.783 95.2544L165.451 95.4829C165.392 95.3998 165.318 95.3306 165.228 95.2752C165.141 95.2163 165.036 95.1869 164.911 95.1869C164.8 95.1869 164.7 95.2146 164.61 95.27C164.523 95.3254 164.48 95.4016 164.48 95.4985C164.48 95.5781 164.504 95.6491 164.553 95.7114C164.605 95.7737 164.703 95.8274 164.849 95.8724L165.134 95.9607C165.359 96.0299 165.532 96.1251 165.654 96.2463C165.778 96.3674 165.841 96.5267 165.841 96.724C165.841 96.8486 165.818 96.9594 165.773 97.0563C165.728 97.1533 165.664 97.2346 165.581 97.3004C165.501 97.3662 165.406 97.4164 165.295 97.451C165.185 97.4856 165.065 97.5029 164.937 97.5029ZM167.633 97.5029C167.432 97.5029 167.249 97.4683 167.083 97.3991C166.916 97.3298 166.775 97.2346 166.657 97.1135C166.539 96.9923 166.447 96.8504 166.382 96.6877C166.319 96.5215 166.288 96.3432 166.288 96.1528C166.288 95.9624 166.321 95.7858 166.387 95.6231C166.453 95.457 166.544 95.3133 166.662 95.1921C166.783 95.071 166.927 94.9757 167.093 94.9065C167.259 94.8373 167.441 94.8027 167.638 94.8027C167.808 94.8027 167.967 94.8321 168.116 94.8909C168.265 94.9463 168.395 95.0311 168.505 95.1454C168.62 95.2562 168.71 95.3929 168.776 95.5556C168.841 95.7149 168.874 95.8983 168.874 96.1061C168.874 96.1303 168.874 96.1528 168.874 96.1736C168.874 96.1909 168.872 96.2134 168.869 96.2411H166.74C166.743 96.3622 166.768 96.4747 166.813 96.5786C166.861 96.6825 166.923 96.7725 167 96.8486C167.079 96.9248 167.173 96.9854 167.28 97.0304C167.391 97.0719 167.51 97.0927 167.638 97.0927C167.839 97.0927 168.004 97.0529 168.132 96.9733C168.263 96.8902 168.369 96.7794 168.448 96.6409L168.801 96.885C168.684 97.0754 168.526 97.226 168.329 97.3368C168.135 97.4475 167.903 97.5029 167.633 97.5029ZM168.417 95.8776C168.4 95.7703 168.367 95.6751 168.319 95.592C168.274 95.5089 168.215 95.4379 168.142 95.3791C168.073 95.3202 167.993 95.2752 167.903 95.244C167.813 95.2129 167.72 95.1973 167.623 95.1973C167.526 95.1973 167.431 95.2129 167.337 95.244C167.244 95.2752 167.159 95.3202 167.083 95.3791C167.006 95.4344 166.941 95.5054 166.885 95.592C166.83 95.6751 166.792 95.7703 166.771 95.8776H168.417ZM171.83 97.5029C171.647 97.5029 171.477 97.4683 171.321 97.3991C171.169 97.3264 171.036 97.2294 170.922 97.1083C170.807 96.9836 170.717 96.84 170.652 96.6773C170.589 96.5146 170.558 96.3397 170.558 96.1528C170.558 95.9659 170.589 95.791 170.652 95.6283C170.717 95.4656 170.807 95.3237 170.922 95.2025C171.036 95.0779 171.169 94.9809 171.321 94.9117C171.477 94.839 171.647 94.8027 171.83 94.8027C172.028 94.8027 172.208 94.8477 172.37 94.9377C172.533 95.0242 172.658 95.1298 172.744 95.2544V94.8546H173.191V97.451H172.744V97.0512C172.658 97.1758 172.533 97.2831 172.37 97.3731C172.208 97.4597 172.028 97.5029 171.83 97.5029ZM171.898 97.0927C172.029 97.0927 172.149 97.0685 172.256 97.02C172.363 96.9715 172.455 96.9058 172.531 96.8227C172.611 96.7361 172.672 96.6357 172.713 96.5215C172.758 96.4072 172.781 96.2843 172.781 96.1528C172.781 96.0212 172.758 95.8983 172.713 95.7841C172.672 95.6699 172.611 95.5712 172.531 95.4881C172.455 95.4016 172.363 95.3341 172.256 95.2856C172.149 95.2371 172.029 95.2129 171.898 95.2129C171.766 95.2129 171.645 95.2371 171.534 95.2856C171.427 95.3341 171.334 95.4016 171.254 95.4881C171.178 95.5712 171.117 95.6699 171.072 95.7841C171.031 95.8983 171.01 96.0212 171.01 96.1528C171.01 96.2843 171.031 96.4072 171.072 96.5215C171.117 96.6357 171.178 96.7361 171.254 96.8227C171.334 96.9058 171.427 96.9715 171.534 97.02C171.645 97.0685 171.766 97.0927 171.898 97.0927ZM174.031 93.5564H174.478V97.451H174.031V93.5564ZM175.325 93.5564H175.771V97.451H175.325V93.5564ZM82.3774 105.503C82.1801 105.503 81.9983 105.468 81.8321 105.399C81.666 105.326 81.5223 105.229 81.4011 105.108C81.28 104.987 81.1848 104.845 81.1155 104.682C81.0497 104.516 81.0169 104.34 81.0169 104.153C81.0169 103.966 81.0497 103.791 81.1155 103.628C81.1848 103.462 81.28 103.318 81.4011 103.197C81.5223 103.076 81.666 102.981 81.8321 102.912C81.9983 102.839 82.1801 102.803 82.3774 102.803C82.5713 102.803 82.7513 102.839 82.9174 102.912C83.0836 102.981 83.2273 103.076 83.3484 103.197C83.4696 103.318 83.5631 103.462 83.6289 103.628C83.6981 103.791 83.7327 103.966 83.7327 104.153C83.7327 104.34 83.6981 104.516 83.6289 104.682C83.5631 104.845 83.4696 104.987 83.3484 105.108C83.2273 105.229 83.0836 105.326 82.9174 105.399C82.7513 105.468 82.5713 105.503 82.3774 105.503ZM82.3774 105.088C82.5124 105.088 82.6353 105.063 82.7461 105.015C82.8569 104.966 82.9503 104.901 83.0265 104.817C83.1061 104.731 83.1667 104.632 83.2082 104.521C83.2532 104.407 83.2757 104.284 83.2757 104.153C83.2757 104.025 83.2532 103.904 83.2082 103.789C83.1667 103.675 83.1061 103.576 83.0265 103.493C82.9503 103.407 82.8569 103.339 82.7461 103.291C82.6353 103.242 82.5124 103.218 82.3774 103.218C82.2424 103.218 82.1195 103.242 82.0087 103.291C81.8979 103.339 81.8027 103.407 81.7231 103.493C81.6435 103.576 81.5812 103.675 81.5361 103.789C81.4946 103.904 81.4738 104.025 81.4738 104.153C81.4738 104.284 81.4946 104.407 81.5361 104.521C81.5812 104.632 81.6435 104.731 81.7231 104.817C81.8027 104.901 81.8979 104.966 82.0087 105.015C82.1195 105.063 82.2424 105.088 82.3774 105.088ZM84.5513 103.265H84.0008V102.855H84.5513V102.33C84.5513 102.195 84.5703 102.077 84.6084 101.977C84.6499 101.877 84.7053 101.794 84.7746 101.728C84.8473 101.658 84.9321 101.608 85.029 101.577C85.126 101.543 85.2315 101.525 85.3458 101.525C85.4254 101.525 85.4981 101.532 85.5639 101.546C85.6297 101.556 85.692 101.572 85.7508 101.593V101.987C85.7093 101.97 85.6574 101.958 85.595 101.951C85.5362 101.941 85.4808 101.935 85.4289 101.935C85.2835 101.935 85.1744 101.968 85.1017 102.034C85.0325 102.096 84.9979 102.211 84.9979 102.377V102.855H85.7508V103.265H84.9979V105.451H84.5513V103.265ZM87.426 106.536L87.992 105.316L86.8548 102.855H87.3481L88.2413 104.828L89.1293 102.855H89.6278L87.9245 106.536H87.426ZM91.1707 105.503C90.9734 105.503 90.7917 105.468 90.6255 105.399C90.4593 105.326 90.3157 105.229 90.1945 105.108C90.0733 104.987 89.9781 104.845 89.9089 104.682C89.8431 104.516 89.8102 104.34 89.8102 104.153C89.8102 103.966 89.8431 103.791 89.9089 103.628C89.9781 103.462 90.0733 103.318 90.1945 103.197C90.3157 103.076 90.4593 102.981 90.6255 102.912C90.7917 102.839 90.9734 102.803 91.1707 102.803C91.3646 102.803 91.5446 102.839 91.7108 102.912C91.877 102.981 92.0206 103.076 92.1418 103.197C92.263 103.318 92.3564 103.462 92.4222 103.628C92.4915 103.791 92.5261 103.966 92.5261 104.153C92.5261 104.34 92.4915 104.516 92.4222 104.682C92.3564 104.845 92.263 104.987 92.1418 105.108C92.0206 105.229 91.877 105.326 91.7108 105.399C91.5446 105.468 91.3646 105.503 91.1707 105.503ZM91.1707 105.088C91.3058 105.088 91.4287 105.063 91.5394 105.015C91.6502 104.966 91.7437 104.901 91.8198 104.817C91.8995 104.731 91.9601 104.632 92.0016 104.521C92.0466 104.407 92.0691 104.284 92.0691 104.153C92.0691 104.025 92.0466 103.904 92.0016 103.789C91.9601 103.675 91.8995 103.576 91.8198 103.493C91.7437 103.407 91.6502 103.339 91.5394 103.291C91.4287 103.242 91.3058 103.218 91.1707 103.218C91.0357 103.218 90.9128 103.242 90.802 103.291C90.6913 103.339 90.5961 103.407 90.5164 103.493C90.4368 103.576 90.3745 103.675 90.3295 103.789C90.288 103.904 90.2672 104.025 90.2672 104.153C90.2672 104.284 90.288 104.407 90.3295 104.521C90.3745 104.632 90.4368 104.731 90.5164 104.817C90.5961 104.901 90.6913 104.966 90.802 105.015C90.9128 105.063 91.0357 105.088 91.1707 105.088ZM94.0862 105.503C93.9443 105.503 93.8145 105.479 93.6968 105.43C93.5791 105.378 93.4787 105.307 93.3956 105.217C93.3125 105.127 93.2467 105.018 93.1983 104.89C93.1533 104.759 93.1308 104.611 93.1308 104.449V102.855H93.5773V104.381C93.5773 104.599 93.6293 104.772 93.7331 104.901C93.8404 105.029 93.9841 105.093 94.1641 105.093C94.2645 105.093 94.358 105.072 94.4445 105.03C94.5346 104.985 94.6107 104.923 94.673 104.843C94.7388 104.76 94.7907 104.66 94.8288 104.542C94.8669 104.425 94.8859 104.291 94.8859 104.142V102.855H95.3325V105.451H94.8859V105.051C94.7994 105.203 94.6851 105.318 94.5432 105.394C94.4047 105.467 94.2524 105.503 94.0862 105.503ZM96.1743 102.855H96.6209V103.358C96.6451 103.275 96.6832 103.201 96.7351 103.135C96.787 103.069 96.8459 103.014 96.9117 102.969C96.9774 102.924 97.0467 102.889 97.1194 102.865C97.1955 102.841 97.2717 102.829 97.3479 102.829C97.4171 102.829 97.4846 102.836 97.5504 102.849V103.312C97.5088 103.294 97.469 103.284 97.431 103.28C97.3929 103.273 97.3513 103.27 97.3063 103.27C97.2232 103.27 97.1402 103.289 97.0571 103.327C96.9774 103.362 96.9047 103.415 96.839 103.488C96.7767 103.561 96.7247 103.654 96.6832 103.769C96.6416 103.879 96.6209 104.011 96.6209 104.163V105.451H96.1743V102.855ZM100.266 105.503C100.083 105.503 99.9133 105.468 99.7575 105.399C99.6052 105.326 99.4719 105.229 99.3577 105.108C99.2434 104.984 99.1534 104.84 99.0876 104.677C99.0253 104.515 98.9942 104.34 98.9942 104.153C98.9942 103.966 99.0253 103.791 99.0876 103.628C99.1534 103.466 99.2434 103.324 99.3577 103.203C99.4719 103.078 99.6052 102.981 99.7575 102.912C99.9133 102.839 100.083 102.803 100.266 102.803C100.464 102.803 100.644 102.848 100.806 102.938C100.969 103.024 101.094 103.13 101.18 103.254V102.855H101.627V105.451H101.18V105.051C101.094 105.176 100.969 105.283 100.806 105.373C100.644 105.46 100.464 105.503 100.266 105.503ZM100.334 105.093C100.465 105.093 100.585 105.068 100.692 105.02C100.8 104.972 100.891 104.906 100.967 104.823C101.047 104.736 101.108 104.636 101.149 104.521C101.194 104.407 101.217 104.284 101.217 104.153C101.217 104.021 101.194 103.898 101.149 103.784C101.108 103.67 101.047 103.571 100.967 103.488C100.891 103.402 100.8 103.334 100.692 103.286C100.585 103.237 100.465 103.213 100.334 103.213C100.202 103.213 100.081 103.237 99.9704 103.286C99.8631 103.334 99.7696 103.402 99.69 103.488C99.6138 103.571 99.5533 103.67 99.5083 103.784C99.4667 103.898 99.4459 104.021 99.4459 104.153C99.4459 104.284 99.4667 104.407 99.5083 104.521C99.5533 104.636 99.6138 104.736 99.69 104.823C99.7696 104.906 99.8631 104.972 99.9704 105.02C100.081 105.068 100.202 105.093 100.334 105.093ZM103.252 105.503C103.02 105.503 102.812 105.454 102.629 105.358C102.445 105.257 102.314 105.105 102.234 104.901L102.597 104.698C102.646 104.83 102.731 104.932 102.852 105.004C102.976 105.074 103.111 105.108 103.257 105.108C103.382 105.108 103.487 105.079 103.574 105.02C103.664 104.958 103.709 104.871 103.709 104.76C103.709 104.667 103.676 104.589 103.61 104.527C103.544 104.464 103.427 104.407 103.257 104.355L102.997 104.272C102.783 104.21 102.62 104.115 102.509 103.987C102.402 103.855 102.348 103.698 102.348 103.514C102.348 103.403 102.371 103.305 102.416 103.218C102.464 103.128 102.528 103.054 102.608 102.995C102.691 102.932 102.786 102.886 102.893 102.855C103.001 102.82 103.117 102.803 103.241 102.803C103.435 102.803 103.605 102.842 103.75 102.922C103.896 102.998 104.012 103.109 104.098 103.254L103.766 103.483C103.707 103.4 103.632 103.331 103.542 103.275C103.456 103.216 103.35 103.187 103.226 103.187C103.115 103.187 103.015 103.215 102.925 103.27C102.838 103.325 102.795 103.402 102.795 103.498C102.795 103.578 102.819 103.649 102.867 103.711C102.919 103.774 103.018 103.827 103.163 103.872L103.449 103.961C103.674 104.03 103.847 104.125 103.968 104.246C104.093 104.367 104.155 104.527 104.155 104.724C104.155 104.849 104.133 104.959 104.088 105.056C104.043 105.153 103.979 105.235 103.896 105.3C103.816 105.366 103.721 105.416 103.61 105.451C103.499 105.486 103.38 105.503 103.252 105.503ZM105.589 105.503C105.358 105.503 105.15 105.454 104.966 105.358C104.783 105.257 104.651 105.105 104.572 104.901L104.935 104.698C104.984 104.83 105.068 104.932 105.19 105.004C105.314 105.074 105.449 105.108 105.595 105.108C105.719 105.108 105.825 105.079 105.911 105.02C106.001 104.958 106.046 104.871 106.046 104.76C106.046 104.667 106.014 104.589 105.948 104.527C105.882 104.464 105.764 104.407 105.595 104.355L105.335 104.272C105.12 104.21 104.958 104.115 104.847 103.987C104.74 103.855 104.686 103.698 104.686 103.514C104.686 103.403 104.708 103.305 104.753 103.218C104.802 103.128 104.866 103.054 104.946 102.995C105.029 102.932 105.124 102.886 105.231 102.855C105.338 102.82 105.454 102.803 105.579 102.803C105.773 102.803 105.943 102.842 106.088 102.922C106.233 102.998 106.349 103.109 106.436 103.254L106.104 103.483C106.045 103.4 105.97 103.331 105.88 103.275C105.794 103.216 105.688 103.187 105.564 103.187C105.453 103.187 105.352 103.215 105.262 103.27C105.176 103.325 105.133 103.402 105.133 103.498C105.133 103.578 105.157 103.649 105.205 103.711C105.257 103.774 105.356 103.827 105.501 103.872L105.787 103.961C106.012 104.03 106.185 104.125 106.306 104.246C106.431 104.367 106.493 104.527 106.493 104.724C106.493 104.849 106.471 104.959 106.426 105.056C106.381 105.153 106.316 105.235 106.233 105.3C106.154 105.366 106.059 105.416 105.948 105.451C105.837 105.486 105.718 105.503 105.589 105.503ZM108.286 105.503C108.085 105.503 107.901 105.468 107.735 105.399C107.569 105.33 107.427 105.235 107.309 105.113C107.192 104.992 107.1 104.85 107.034 104.688C106.972 104.521 106.941 104.343 106.941 104.153C106.941 103.962 106.974 103.786 107.039 103.623C107.105 103.457 107.197 103.313 107.315 103.192C107.436 103.071 107.579 102.976 107.746 102.907C107.912 102.837 108.093 102.803 108.291 102.803C108.46 102.803 108.62 102.832 108.769 102.891C108.917 102.946 109.047 103.031 109.158 103.145C109.272 103.256 109.362 103.393 109.428 103.556C109.494 103.715 109.527 103.898 109.527 104.106C109.527 104.13 109.527 104.153 109.527 104.174C109.527 104.191 109.525 104.213 109.521 104.241H107.392C107.396 104.362 107.42 104.475 107.465 104.579C107.514 104.682 107.576 104.772 107.652 104.849C107.732 104.925 107.825 104.985 107.932 105.03C108.043 105.072 108.163 105.093 108.291 105.093C108.492 105.093 108.656 105.053 108.784 104.973C108.916 104.89 109.021 104.779 109.101 104.641L109.454 104.885C109.336 105.075 109.179 105.226 108.981 105.337C108.788 105.448 108.556 105.503 108.286 105.503ZM109.07 103.878C109.052 103.77 109.02 103.675 108.971 103.592C108.926 103.509 108.867 103.438 108.794 103.379C108.725 103.32 108.646 103.275 108.556 103.244C108.466 103.213 108.372 103.197 108.275 103.197C108.178 103.197 108.083 103.213 107.99 103.244C107.896 103.275 107.811 103.32 107.735 103.379C107.659 103.434 107.593 103.505 107.538 103.592C107.482 103.675 107.444 103.77 107.424 103.878H109.07ZM111.132 105.477C111.018 105.477 110.913 105.461 110.816 105.43C110.719 105.396 110.634 105.347 110.561 105.285C110.492 105.219 110.437 105.136 110.395 105.036C110.357 104.935 110.338 104.817 110.338 104.682V103.265H109.787V102.855H110.338V102.133H110.784V102.855H111.532V103.265H110.784V104.625C110.784 104.792 110.821 104.907 110.894 104.973C110.966 105.036 111.074 105.067 111.215 105.067C111.271 105.067 111.326 105.063 111.382 105.056C111.441 105.046 111.491 105.032 111.532 105.015V105.415C111.477 105.432 111.416 105.446 111.35 105.456C111.285 105.47 111.212 105.477 111.132 105.477ZM112.887 105.503C112.655 105.503 112.447 105.454 112.264 105.358C112.08 105.257 111.949 105.105 111.869 104.901L112.233 104.698C112.281 104.83 112.366 104.932 112.487 105.004C112.612 105.074 112.747 105.108 112.892 105.108C113.017 105.108 113.122 105.079 113.209 105.02C113.299 104.958 113.344 104.871 113.344 104.76C113.344 104.667 113.311 104.589 113.245 104.527C113.179 104.464 113.062 104.407 112.892 104.355L112.632 104.272C112.418 104.21 112.255 104.115 112.144 103.987C112.037 103.855 111.983 103.698 111.983 103.514C111.983 103.403 112.006 103.305 112.051 103.218C112.099 103.128 112.163 103.054 112.243 102.995C112.326 102.932 112.421 102.886 112.529 102.855C112.636 102.82 112.752 102.803 112.876 102.803C113.07 102.803 113.24 102.842 113.385 102.922C113.531 102.998 113.647 103.109 113.733 103.254L113.401 103.483C113.342 103.4 113.268 103.331 113.178 103.275C113.091 103.216 112.986 103.187 112.861 103.187C112.75 103.187 112.65 103.215 112.56 103.27C112.473 103.325 112.43 103.402 112.43 103.498C112.43 103.578 112.454 103.649 112.503 103.711C112.555 103.774 112.653 103.827 112.799 103.872L113.084 103.961C113.309 104.03 113.482 104.125 113.603 104.246C113.728 104.367 113.79 104.527 113.79 104.724C113.79 104.849 113.768 104.959 113.723 105.056C113.678 105.153 113.614 105.235 113.531 105.3C113.451 105.366 113.356 105.416 113.245 105.451C113.134 105.486 113.015 105.503 112.887 105.503ZM115.845 103.265H115.295V102.855H115.845V102.33C115.845 102.195 115.864 102.077 115.902 101.977C115.944 101.877 115.999 101.794 116.069 101.728C116.141 101.658 116.226 101.608 116.323 101.577C116.42 101.543 116.526 101.525 116.64 101.525C116.719 101.525 116.792 101.532 116.858 101.546C116.924 101.556 116.986 101.572 117.045 101.593V101.987C117.003 101.97 116.951 101.958 116.889 101.951C116.83 101.941 116.775 101.935 116.723 101.935C116.577 101.935 116.468 101.968 116.396 102.034C116.326 102.096 116.292 102.211 116.292 102.377V102.855H117.045V103.265H116.292V105.451H115.845V103.265ZM118.621 105.503C118.423 105.503 118.242 105.468 118.076 105.399C117.909 105.326 117.766 105.229 117.645 105.108C117.523 104.987 117.428 104.845 117.359 104.682C117.293 104.516 117.26 104.34 117.26 104.153C117.26 103.966 117.293 103.791 117.359 103.628C117.428 103.462 117.523 103.318 117.645 103.197C117.766 103.076 117.909 102.981 118.076 102.912C118.242 102.839 118.423 102.803 118.621 102.803C118.815 102.803 118.995 102.839 119.161 102.912C119.327 102.981 119.471 103.076 119.592 103.197C119.713 103.318 119.807 103.462 119.872 103.628C119.942 103.791 119.976 103.966 119.976 104.153C119.976 104.34 119.942 104.516 119.872 104.682C119.807 104.845 119.713 104.987 119.592 105.108C119.471 105.229 119.327 105.326 119.161 105.399C118.995 105.468 118.815 105.503 118.621 105.503ZM118.621 105.088C118.756 105.088 118.879 105.063 118.989 105.015C119.1 104.966 119.194 104.901 119.27 104.817C119.35 104.731 119.41 104.632 119.452 104.521C119.497 104.407 119.519 104.284 119.519 104.153C119.519 104.025 119.497 103.904 119.452 103.789C119.41 103.675 119.35 103.576 119.27 103.493C119.194 103.407 119.1 103.339 118.989 103.291C118.879 103.242 118.756 103.218 118.621 103.218C118.486 103.218 118.363 103.242 118.252 103.291C118.141 103.339 118.046 103.407 117.967 103.493C117.887 103.576 117.825 103.675 117.78 103.789C117.738 103.904 117.717 104.025 117.717 104.153C117.717 104.284 117.738 104.407 117.78 104.521C117.825 104.632 117.887 104.731 117.967 104.817C118.046 104.901 118.141 104.966 118.252 105.015C118.363 105.063 118.486 105.088 118.621 105.088ZM120.617 102.855H121.064V103.358C121.088 103.275 121.126 103.201 121.178 103.135C121.23 103.069 121.289 103.014 121.355 102.969C121.42 102.924 121.49 102.889 121.562 102.865C121.638 102.841 121.715 102.829 121.791 102.829C121.86 102.829 121.927 102.836 121.993 102.849V103.312C121.952 103.294 121.912 103.284 121.874 103.28C121.836 103.273 121.794 103.27 121.749 103.27C121.666 103.27 121.583 103.289 121.5 103.327C121.42 103.362 121.348 103.415 121.282 103.488C121.22 103.561 121.168 103.654 121.126 103.769C121.085 103.879 121.064 104.011 121.064 104.163V105.451H120.617V102.855ZM124.772 105.03C124.9 105.03 125.017 105.008 125.125 104.963C125.235 104.918 125.329 104.856 125.405 104.776C125.481 104.693 125.54 104.596 125.582 104.485C125.627 104.374 125.649 104.253 125.649 104.122C125.649 103.994 125.627 103.874 125.582 103.763C125.54 103.649 125.481 103.552 125.405 103.473C125.329 103.393 125.235 103.331 125.125 103.286C125.017 103.237 124.9 103.213 124.772 103.213C124.64 103.213 124.521 103.237 124.413 103.286C124.306 103.331 124.214 103.393 124.138 103.473C124.062 103.552 124.001 103.649 123.956 103.763C123.915 103.874 123.894 103.994 123.894 104.122C123.894 104.253 123.915 104.374 123.956 104.485C124.001 104.596 124.062 104.693 124.138 104.776C124.214 104.856 124.306 104.918 124.413 104.963C124.521 105.008 124.64 105.03 124.772 105.03ZM124.746 106.588C124.465 106.588 124.219 106.536 124.008 106.432C123.797 106.329 123.636 106.204 123.525 106.059L123.837 105.747C123.941 105.879 124.067 105.984 124.216 106.064C124.368 106.143 124.545 106.183 124.746 106.183C124.856 106.183 124.964 106.166 125.068 106.131C125.171 106.097 125.263 106.041 125.343 105.965C125.426 105.892 125.492 105.799 125.54 105.685C125.589 105.574 125.613 105.441 125.613 105.285V104.989C125.523 105.12 125.398 105.229 125.239 105.316C125.08 105.403 124.903 105.446 124.709 105.446C124.529 105.446 124.361 105.413 124.206 105.347C124.05 105.278 123.915 105.184 123.801 105.067C123.686 104.946 123.596 104.805 123.531 104.646C123.468 104.483 123.437 104.309 123.437 104.122C123.437 103.938 123.468 103.767 123.531 103.608C123.596 103.445 123.686 103.305 123.801 103.187C123.915 103.066 124.05 102.972 124.206 102.907C124.361 102.837 124.529 102.803 124.709 102.803C124.903 102.803 125.08 102.846 125.239 102.932C125.398 103.016 125.523 103.123 125.613 103.254V102.855H126.059V105.3C126.059 105.519 126.025 105.707 125.956 105.866C125.89 106.029 125.798 106.162 125.68 106.266C125.563 106.374 125.424 106.453 125.265 106.505C125.106 106.561 124.933 106.588 124.746 106.588ZM128.053 105.503C127.856 105.503 127.674 105.468 127.508 105.399C127.342 105.326 127.198 105.229 127.077 105.108C126.956 104.987 126.86 104.845 126.791 104.682C126.725 104.516 126.693 104.34 126.693 104.153C126.693 103.966 126.725 103.791 126.791 103.628C126.86 103.462 126.956 103.318 127.077 103.197C127.198 103.076 127.342 102.981 127.508 102.912C127.674 102.839 127.856 102.803 128.053 102.803C128.247 102.803 128.427 102.839 128.593 102.912C128.759 102.981 128.903 103.076 129.024 103.197C129.145 103.318 129.239 103.462 129.305 103.628C129.374 103.791 129.408 103.966 129.408 104.153C129.408 104.34 129.374 104.516 129.305 104.682C129.239 104.845 129.145 104.987 129.024 105.108C128.903 105.229 128.759 105.326 128.593 105.399C128.427 105.468 128.247 105.503 128.053 105.503ZM128.053 105.088C128.188 105.088 128.311 105.063 128.422 105.015C128.533 104.966 128.626 104.901 128.702 104.817C128.782 104.731 128.842 104.632 128.884 104.521C128.929 104.407 128.951 104.284 128.951 104.153C128.951 104.025 128.929 103.904 128.884 103.789C128.842 103.675 128.782 103.576 128.702 103.493C128.626 103.407 128.533 103.339 128.422 103.291C128.311 103.242 128.188 103.218 128.053 103.218C127.918 103.218 127.795 103.242 127.684 103.291C127.574 103.339 127.478 103.407 127.399 103.493C127.319 103.576 127.257 103.675 127.212 103.789C127.17 103.904 127.15 104.025 127.15 104.153C127.15 104.284 127.17 104.407 127.212 104.521C127.257 104.632 127.319 104.731 127.399 104.817C127.478 104.901 127.574 104.966 127.684 105.015C127.795 105.063 127.918 105.088 128.053 105.088ZM131.202 105.503C131.005 105.503 130.823 105.468 130.657 105.399C130.491 105.326 130.347 105.229 130.226 105.108C130.105 104.987 130.01 104.845 129.94 104.682C129.875 104.516 129.842 104.34 129.842 104.153C129.842 103.966 129.875 103.791 129.94 103.628C130.01 103.462 130.105 103.318 130.226 103.197C130.347 103.076 130.491 102.981 130.657 102.912C130.823 102.839 131.005 102.803 131.202 102.803C131.396 102.803 131.576 102.839 131.742 102.912C131.909 102.981 132.052 103.076 132.173 103.197C132.295 103.318 132.388 103.462 132.454 103.628C132.523 103.791 132.558 103.966 132.558 104.153C132.558 104.34 132.523 104.516 132.454 104.682C132.388 104.845 132.295 104.987 132.173 105.108C132.052 105.229 131.909 105.326 131.742 105.399C131.576 105.468 131.396 105.503 131.202 105.503ZM131.202 105.088C131.337 105.088 131.46 105.063 131.571 105.015C131.682 104.966 131.775 104.901 131.851 104.817C131.931 104.731 131.992 104.632 132.033 104.521C132.078 104.407 132.101 104.284 132.101 104.153C132.101 104.025 132.078 103.904 132.033 103.789C131.992 103.675 131.931 103.576 131.851 103.493C131.775 103.407 131.682 103.339 131.571 103.291C131.46 103.242 131.337 103.218 131.202 103.218C131.067 103.218 130.944 103.242 130.834 103.291C130.723 103.339 130.628 103.407 130.548 103.493C130.468 103.576 130.406 103.675 130.361 103.789C130.32 103.904 130.299 104.025 130.299 104.153C130.299 104.284 130.32 104.407 130.361 104.521C130.406 104.632 130.468 104.731 130.548 104.817C130.628 104.901 130.723 104.966 130.834 105.015C130.944 105.063 131.067 105.088 131.202 105.088ZM134.268 105.503C134.085 105.503 133.915 105.468 133.759 105.399C133.607 105.326 133.474 105.229 133.36 105.108C133.245 104.984 133.155 104.84 133.09 104.677C133.027 104.515 132.996 104.34 132.996 104.153C132.996 103.966 133.027 103.791 133.09 103.628C133.155 103.466 133.245 103.324 133.36 103.203C133.474 103.078 133.607 102.981 133.759 102.912C133.915 102.839 134.085 102.803 134.268 102.803C134.466 102.803 134.646 102.848 134.808 102.938C134.971 103.024 135.096 103.13 135.182 103.254V101.556H135.629V105.451H135.182V105.051C135.096 105.176 134.971 105.283 134.808 105.373C134.646 105.46 134.466 105.503 134.268 105.503ZM134.336 105.093C134.467 105.093 134.587 105.068 134.694 105.02C134.802 104.972 134.893 104.906 134.969 104.823C135.049 104.736 135.11 104.636 135.151 104.521C135.196 104.407 135.219 104.284 135.219 104.153C135.219 104.021 135.196 103.898 135.151 103.784C135.11 103.67 135.049 103.571 134.969 103.488C134.893 103.402 134.802 103.334 134.694 103.286C134.587 103.237 134.467 103.213 134.336 103.213C134.204 103.213 134.083 103.237 133.972 103.286C133.865 103.334 133.772 103.402 133.692 103.488C133.616 103.571 133.555 103.67 133.51 103.784C133.469 103.898 133.448 104.021 133.448 104.153C133.448 104.284 133.469 104.407 133.51 104.521C133.555 104.636 133.616 104.736 133.692 104.823C133.772 104.906 133.865 104.972 133.972 105.02C134.083 105.068 134.204 105.093 134.336 105.093ZM136.703 105.493C136.596 105.493 136.504 105.454 136.428 105.378C136.355 105.302 136.319 105.21 136.319 105.103C136.319 104.999 136.355 104.909 136.428 104.833C136.504 104.753 136.596 104.714 136.703 104.714C136.811 104.714 136.901 104.753 136.973 104.833C137.049 104.909 137.087 104.999 137.087 105.103C137.087 105.21 137.049 105.302 136.973 105.378C136.901 105.454 136.811 105.493 136.703 105.493ZM168.352 105.493C168.245 105.493 168.153 105.454 168.077 105.378C168.004 105.302 167.968 105.21 167.968 105.103C167.968 104.999 168.004 104.909 168.077 104.833C168.153 104.753 168.245 104.714 168.352 104.714C168.46 104.714 168.55 104.753 168.622 104.833C168.698 104.909 168.736 104.999 168.736 105.103C168.736 105.21 168.698 105.302 168.622 105.378C168.55 105.454 168.46 105.493 168.352 105.493Z" fill="#24272A"/>
+<path d="M140.351 101.764H140.833V104.994H142.615V105.451H140.351V101.764ZM144.189 105.503C143.988 105.503 143.805 105.468 143.639 105.399C143.473 105.33 143.331 105.235 143.213 105.113C143.095 104.992 143.004 104.85 142.938 104.688C142.875 104.521 142.844 104.343 142.844 104.153C142.844 103.962 142.877 103.786 142.943 103.623C143.009 103.457 143.1 103.313 143.218 103.192C143.339 103.071 143.483 102.976 143.649 102.907C143.815 102.837 143.997 102.803 144.194 102.803C144.364 102.803 144.523 102.832 144.672 102.891C144.821 102.946 144.951 103.031 145.062 103.145C145.176 103.256 145.266 103.393 145.332 103.556C145.397 103.715 145.43 103.898 145.43 104.106C145.43 104.13 145.43 104.153 145.43 104.174C145.43 104.191 145.429 104.213 145.425 104.241H143.296C143.3 104.362 143.324 104.475 143.369 104.579C143.417 104.682 143.48 104.772 143.556 104.849C143.635 104.925 143.729 104.985 143.836 105.03C143.947 105.072 144.066 105.093 144.194 105.093C144.395 105.093 144.56 105.053 144.688 104.973C144.819 104.89 144.925 104.779 145.005 104.641L145.358 104.885C145.24 105.075 145.082 105.226 144.885 105.337C144.691 105.448 144.459 105.503 144.189 105.503ZM144.973 103.878C144.956 103.77 144.923 103.675 144.875 103.592C144.83 103.509 144.771 103.438 144.698 103.379C144.629 103.32 144.549 103.275 144.459 103.244C144.369 103.213 144.276 103.197 144.179 103.197C144.082 103.197 143.987 103.213 143.893 103.244C143.8 103.275 143.715 103.32 143.639 103.379C143.563 103.434 143.497 103.505 143.441 103.592C143.386 103.675 143.348 103.77 143.327 103.878H144.973ZM147.134 105.503C146.95 105.503 146.781 105.468 146.625 105.399C146.473 105.326 146.339 105.229 146.225 105.108C146.111 104.984 146.021 104.84 145.955 104.677C145.893 104.515 145.862 104.34 145.862 104.153C145.862 103.966 145.893 103.791 145.955 103.628C146.021 103.466 146.111 103.324 146.225 103.203C146.339 103.078 146.473 102.981 146.625 102.912C146.781 102.839 146.95 102.803 147.134 102.803C147.331 102.803 147.511 102.848 147.674 102.938C147.837 103.024 147.961 103.13 148.048 103.254V102.855H148.494V105.451H148.048V105.051C147.961 105.176 147.837 105.283 147.674 105.373C147.511 105.46 147.331 105.503 147.134 105.503ZM147.201 105.093C147.333 105.093 147.452 105.068 147.56 105.02C147.667 104.972 147.759 104.906 147.835 104.823C147.915 104.736 147.975 104.636 148.017 104.521C148.062 104.407 148.084 104.284 148.084 104.153C148.084 104.021 148.062 103.898 148.017 103.784C147.975 103.67 147.915 103.571 147.835 103.488C147.759 103.402 147.667 103.334 147.56 103.286C147.452 103.237 147.333 103.213 147.201 103.213C147.07 103.213 146.949 103.237 146.838 103.286C146.731 103.334 146.637 103.402 146.557 103.488C146.481 103.571 146.421 103.67 146.376 103.784C146.334 103.898 146.313 104.021 146.313 104.153C146.313 104.284 146.334 104.407 146.376 104.521C146.421 104.636 146.481 104.736 146.557 104.823C146.637 104.906 146.731 104.972 146.838 105.02C146.949 105.068 147.07 105.093 147.201 105.093ZM149.335 102.855H149.782V103.358C149.806 103.275 149.844 103.201 149.896 103.135C149.948 103.069 150.007 103.014 150.072 102.969C150.138 102.924 150.207 102.889 150.28 102.865C150.356 102.841 150.432 102.829 150.509 102.829C150.578 102.829 150.645 102.836 150.711 102.849V103.312C150.67 103.294 150.63 103.284 150.592 103.28C150.554 103.273 150.512 103.27 150.467 103.27C150.384 103.27 150.301 103.289 150.218 103.327C150.138 103.362 150.065 103.415 150 103.488C149.937 103.561 149.885 103.654 149.844 103.769C149.802 103.879 149.782 104.011 149.782 104.163V105.451H149.335V102.855ZM151.237 102.855H151.683V103.254C151.773 103.099 151.891 102.984 152.036 102.912C152.182 102.839 152.339 102.803 152.509 102.803C152.654 102.803 152.788 102.827 152.909 102.875C153.03 102.924 153.132 102.995 153.215 103.088C153.302 103.178 153.369 103.289 153.418 103.421C153.466 103.549 153.49 103.692 153.49 103.852V105.451H153.049V103.919C153.049 103.701 152.992 103.53 152.878 103.405C152.767 103.277 152.62 103.213 152.436 103.213C152.332 103.213 152.234 103.234 152.14 103.275C152.05 103.317 151.971 103.379 151.901 103.462C151.836 103.542 151.782 103.64 151.74 103.758C151.702 103.876 151.683 104.011 151.683 104.163V105.451H151.237V102.855ZM158.891 103.924C158.891 103.713 158.848 103.542 158.762 103.41C158.675 103.279 158.547 103.213 158.377 103.213C158.17 103.213 158 103.294 157.868 103.457C157.74 103.62 157.673 103.841 157.666 104.122V105.451H157.219V103.924C157.219 103.713 157.176 103.542 157.089 103.41C157.006 103.279 156.88 103.213 156.71 103.213C156.499 103.213 156.326 103.298 156.191 103.467C156.06 103.637 155.994 103.869 155.994 104.163V105.451H155.547V102.855H155.994V103.254C156.07 103.116 156.175 103.007 156.311 102.927C156.446 102.844 156.601 102.803 156.778 102.803C156.972 102.803 157.136 102.853 157.271 102.953C157.41 103.05 157.512 103.185 157.578 103.358C157.647 103.189 157.756 103.054 157.905 102.953C158.057 102.853 158.232 102.803 158.429 102.803C158.571 102.803 158.697 102.829 158.808 102.881C158.923 102.929 159.018 103 159.094 103.093C159.173 103.183 159.234 103.294 159.276 103.426C159.317 103.554 159.338 103.698 159.338 103.857V105.451H158.891V103.924ZM161.294 105.503C161.097 105.503 160.915 105.468 160.749 105.399C160.583 105.326 160.439 105.229 160.318 105.108C160.197 104.987 160.102 104.845 160.033 104.682C159.967 104.516 159.934 104.34 159.934 104.153C159.934 103.966 159.967 103.791 160.033 103.628C160.102 103.462 160.197 103.318 160.318 103.197C160.439 103.076 160.583 102.981 160.749 102.912C160.915 102.839 161.097 102.803 161.294 102.803C161.488 102.803 161.668 102.839 161.834 102.912C162.001 102.981 162.144 103.076 162.265 103.197C162.387 103.318 162.48 103.462 162.546 103.628C162.615 103.791 162.65 103.966 162.65 104.153C162.65 104.34 162.615 104.516 162.546 104.682C162.48 104.845 162.387 104.987 162.265 105.108C162.144 105.229 162.001 105.326 161.834 105.399C161.668 105.468 161.488 105.503 161.294 105.503ZM161.294 105.088C161.429 105.088 161.552 105.063 161.663 105.015C161.774 104.966 161.867 104.901 161.944 104.817C162.023 104.731 162.084 104.632 162.125 104.521C162.17 104.407 162.193 104.284 162.193 104.153C162.193 104.025 162.17 103.904 162.125 103.789C162.084 103.675 162.023 103.576 161.944 103.493C161.867 103.407 161.774 103.339 161.663 103.291C161.552 103.242 161.429 103.218 161.294 103.218C161.159 103.218 161.037 103.242 160.926 103.291C160.815 103.339 160.72 103.407 160.64 103.493C160.561 103.576 160.498 103.675 160.453 103.789C160.412 103.904 160.391 104.025 160.391 104.153C160.391 104.284 160.412 104.407 160.453 104.521C160.498 104.632 160.561 104.731 160.64 104.817C160.72 104.901 160.815 104.966 160.926 105.015C161.037 105.063 161.159 105.088 161.294 105.088ZM163.291 102.855H163.737V103.358C163.762 103.275 163.8 103.201 163.852 103.135C163.904 103.069 163.962 103.014 164.028 102.969C164.094 102.924 164.163 102.889 164.236 102.865C164.312 102.841 164.388 102.829 164.464 102.829C164.534 102.829 164.601 102.836 164.667 102.849V103.312C164.625 103.294 164.586 103.284 164.547 103.28C164.509 103.273 164.468 103.27 164.423 103.27C164.34 103.27 164.257 103.289 164.174 103.327C164.094 103.362 164.021 103.415 163.955 103.488C163.893 103.561 163.841 103.654 163.8 103.769C163.758 103.879 163.737 104.011 163.737 104.163V105.451H163.291V102.855ZM166.244 105.503C166.043 105.503 165.859 105.468 165.693 105.399C165.527 105.33 165.385 105.235 165.267 105.113C165.15 104.992 165.058 104.85 164.992 104.688C164.93 104.521 164.899 104.343 164.899 104.153C164.899 103.962 164.932 103.786 164.997 103.623C165.063 103.457 165.155 103.313 165.273 103.192C165.394 103.071 165.537 102.976 165.704 102.907C165.87 102.837 166.051 102.803 166.249 102.803C166.418 102.803 166.578 102.832 166.727 102.891C166.875 102.946 167.005 103.031 167.116 103.145C167.23 103.256 167.32 103.393 167.386 103.556C167.452 103.715 167.485 103.898 167.485 104.106C167.485 104.13 167.485 104.153 167.485 104.174C167.485 104.191 167.483 104.213 167.48 104.241H165.35C165.354 104.362 165.378 104.475 165.423 104.579C165.472 104.682 165.534 104.772 165.61 104.849C165.69 104.925 165.783 104.985 165.89 105.03C166.001 105.072 166.121 105.093 166.249 105.093C166.45 105.093 166.614 105.053 166.742 104.973C166.874 104.89 166.979 104.779 167.059 104.641L167.412 104.885C167.294 105.075 167.137 105.226 166.939 105.337C166.746 105.448 166.514 105.503 166.244 105.503ZM167.028 103.878C167.01 103.77 166.978 103.675 166.929 103.592C166.884 103.509 166.825 103.438 166.753 103.379C166.683 103.32 166.604 103.275 166.514 103.244C166.424 103.213 166.33 103.197 166.233 103.197C166.136 103.197 166.041 103.213 165.948 103.244C165.854 103.275 165.769 103.32 165.693 103.379C165.617 103.434 165.551 103.505 165.496 103.592C165.44 103.675 165.402 103.77 165.382 103.878H167.028Z" fill="#037DD6"/>
+<path d="M81.8633 113.65H80.8796V113.258H83.252V113.65H82.2683V116.418H81.8633V113.65ZM83.7522 116.418V113.08H84.135V114.536C84.2122 114.402 84.313 114.304 84.4377 114.242C84.5623 114.179 84.6973 114.148 84.8427 114.148C84.9673 114.148 85.0816 114.169 85.1854 114.211C85.2893 114.252 85.3768 114.313 85.4481 114.393C85.5222 114.47 85.5801 114.565 85.6216 114.678C85.6632 114.788 85.684 114.911 85.684 115.047V116.418H85.3056V115.105C85.3056 114.918 85.2567 114.771 85.1587 114.665C85.0638 114.555 84.9377 114.5 84.7804 114.5C84.6914 114.5 84.6068 114.518 84.5267 114.553C84.4495 114.589 84.3813 114.642 84.3219 114.714C84.2656 114.782 84.2196 114.866 84.184 114.967C84.1513 115.068 84.135 115.184 84.135 115.314V116.418H83.7522ZM86.6618 113.596C86.5847 113.596 86.5194 113.571 86.466 113.521C86.4126 113.467 86.3859 113.402 86.3859 113.325C86.3859 113.251 86.4126 113.187 86.466 113.133C86.5194 113.08 86.5847 113.053 86.6618 113.053C86.739 113.053 86.8028 113.08 86.8532 113.133C86.9037 113.187 86.9289 113.251 86.9289 113.325C86.9289 113.402 86.9037 113.467 86.8532 113.521C86.8028 113.571 86.739 113.596 86.6618 113.596ZM86.466 114.193H86.8488V116.418H86.466V114.193ZM88.3392 116.463C88.1404 116.463 87.9624 116.421 87.8051 116.338C87.6478 116.252 87.5351 116.122 87.4668 115.947L87.7784 115.773C87.82 115.886 87.8927 115.973 87.9965 116.036C88.1033 116.095 88.2191 116.125 88.3437 116.125C88.4505 116.125 88.541 116.099 88.6152 116.049C88.6923 115.995 88.7309 115.921 88.7309 115.826C88.7309 115.746 88.7027 115.679 88.6464 115.626C88.59 115.573 88.4891 115.524 88.3437 115.479L88.1211 115.408C87.9372 115.355 87.7977 115.273 87.7027 115.163C87.6108 115.05 87.5648 114.915 87.5648 114.758C87.5648 114.663 87.584 114.579 87.6226 114.504C87.6642 114.427 87.7191 114.363 87.7873 114.313C87.8585 114.26 87.9401 114.22 88.0321 114.193C88.1241 114.163 88.2235 114.148 88.3303 114.148C88.4965 114.148 88.6419 114.182 88.7665 114.251C88.8912 114.316 88.9906 114.411 89.0648 114.536L88.7799 114.731C88.7294 114.66 88.6656 114.601 88.5885 114.553C88.5143 114.503 88.4238 114.478 88.317 114.478C88.222 114.478 88.136 114.501 88.0588 114.549C87.9846 114.596 87.9475 114.662 87.9475 114.745C87.9475 114.813 87.9683 114.874 88.0099 114.927C88.0544 114.981 88.1389 115.027 88.2636 115.065L88.5084 115.141C88.7013 115.2 88.8496 115.282 88.9535 115.386C89.0603 115.49 89.1137 115.626 89.1137 115.795C89.1137 115.902 89.0944 115.997 89.0558 116.08C89.0173 116.163 88.9624 116.233 88.8912 116.289C88.8229 116.346 88.7413 116.389 88.6464 116.418C88.5514 116.448 88.449 116.463 88.3392 116.463ZM91.9226 116.463C91.7535 116.463 91.5977 116.433 91.4553 116.374C91.3128 116.314 91.1897 116.233 91.0858 116.129C90.982 116.022 90.9004 115.899 90.841 115.76C90.7846 115.617 90.7565 115.466 90.7565 115.306C90.7565 115.145 90.7846 114.996 90.841 114.856C90.9004 114.714 90.982 114.59 91.0858 114.487C91.1897 114.38 91.3128 114.297 91.4553 114.237C91.5977 114.178 91.7535 114.148 91.9226 114.148C92.1541 114.148 92.3588 114.203 92.5369 114.313C92.7149 114.423 92.8529 114.567 92.9508 114.745L92.617 114.932C92.5547 114.804 92.4627 114.702 92.341 114.625C92.2223 114.544 92.0829 114.504 91.9226 114.504C91.8069 114.504 91.7016 114.525 91.6066 114.567C91.5116 114.608 91.4286 114.666 91.3573 114.74C91.2891 114.812 91.2357 114.896 91.1971 114.994C91.1615 115.092 91.1437 115.196 91.1437 115.306C91.1437 115.418 91.1615 115.524 91.1971 115.622C91.2357 115.717 91.2891 115.801 91.3573 115.875C91.4286 115.947 91.5116 116.003 91.6066 116.044C91.7016 116.086 91.8069 116.107 91.9226 116.107C92.0829 116.107 92.2223 116.068 92.341 115.991C92.4627 115.911 92.5547 115.807 92.617 115.679L92.9508 115.866C92.8529 116.044 92.7149 116.188 92.5369 116.298C92.3588 116.408 92.1541 116.463 91.9226 116.463ZM94.5276 116.463C94.3585 116.463 94.2027 116.433 94.0603 116.374C93.9178 116.312 93.7947 116.228 93.6908 116.125C93.587 116.021 93.5054 115.899 93.446 115.76C93.3897 115.617 93.3615 115.466 93.3615 115.306C93.3615 115.145 93.3897 114.996 93.446 114.856C93.5054 114.714 93.587 114.59 93.6908 114.487C93.7947 114.383 93.9178 114.301 94.0603 114.242C94.2027 114.179 94.3585 114.148 94.5276 114.148C94.6938 114.148 94.8481 114.179 94.9905 114.242C95.133 114.301 95.2561 114.383 95.36 114.487C95.4638 114.59 95.5439 114.714 95.6003 114.856C95.6597 114.996 95.6893 115.145 95.6893 115.306C95.6893 115.466 95.6597 115.617 95.6003 115.76C95.5439 115.899 95.4638 116.021 95.36 116.125C95.2561 116.228 95.133 116.312 94.9905 116.374C94.8481 116.433 94.6938 116.463 94.5276 116.463ZM94.5276 116.107C94.6434 116.107 94.7487 116.086 94.8437 116.044C94.9386 116.003 95.0187 115.947 95.084 115.875C95.1523 115.801 95.2042 115.717 95.2398 115.622C95.2784 115.524 95.2977 115.418 95.2977 115.306C95.2977 115.196 95.2784 115.092 95.2398 114.994C95.2042 114.896 95.1523 114.812 95.084 114.74C95.0187 114.666 94.9386 114.608 94.8437 114.567C94.7487 114.525 94.6434 114.504 94.5276 114.504C94.4119 114.504 94.3066 114.525 94.2116 114.567C94.1167 114.608 94.0351 114.666 93.9668 114.74C93.8986 114.812 93.8451 114.896 93.8066 114.994C93.771 115.092 93.7532 115.196 93.7532 115.306C93.7532 115.418 93.771 115.524 93.8066 115.622C93.8451 115.717 93.8986 115.801 93.9668 115.875C94.0351 115.947 94.1167 116.003 94.2116 116.044C94.3066 116.086 94.4119 116.107 94.5276 116.107ZM96.3315 114.193H96.7143V114.536C96.7915 114.402 96.8924 114.304 97.017 114.242C97.1416 114.179 97.2766 114.148 97.422 114.148C97.5467 114.148 97.6609 114.169 97.7648 114.211C97.8686 114.252 97.9562 114.313 98.0274 114.393C98.1016 114.47 98.1594 114.565 98.201 114.678C98.2425 114.788 98.2633 114.911 98.2633 115.047V116.418H97.8849V115.105C97.8849 114.918 97.836 114.771 97.7381 114.665C97.6431 114.555 97.517 114.5 97.3597 114.5C97.2707 114.5 97.1861 114.518 97.106 114.553C97.0289 114.589 96.9606 114.642 96.9013 114.714C96.8449 114.782 96.7989 114.866 96.7633 114.967C96.7306 115.068 96.7143 115.184 96.7143 115.314V116.418H96.3315V114.193ZM99.8827 116.441C99.7848 116.441 99.6943 116.427 99.6112 116.401C99.5281 116.371 99.4554 116.329 99.3931 116.276C99.3338 116.22 99.2863 116.148 99.2507 116.062C99.218 115.976 99.2017 115.875 99.2017 115.76V114.544H98.7299V114.193H99.2017V113.574H99.5845V114.193H100.225V114.544H99.5845V115.711C99.5845 115.853 99.6157 115.952 99.678 116.009C99.7403 116.062 99.8323 116.089 99.9539 116.089C100.001 116.089 100.049 116.086 100.096 116.08C100.147 116.071 100.19 116.059 100.225 116.044V116.387C100.178 116.402 100.126 116.414 100.07 116.423C100.013 116.435 99.951 116.441 99.8827 116.441ZM101.756 116.463C101.584 116.463 101.427 116.433 101.284 116.374C101.142 116.314 101.02 116.233 100.919 116.129C100.818 116.025 100.74 115.904 100.683 115.764C100.63 115.622 100.603 115.469 100.603 115.306C100.603 115.142 100.631 114.991 100.688 114.852C100.744 114.709 100.823 114.586 100.924 114.482C101.027 114.378 101.151 114.297 101.293 114.237C101.435 114.178 101.591 114.148 101.76 114.148C101.906 114.148 102.042 114.174 102.17 114.224C102.298 114.271 102.409 114.344 102.504 114.442C102.602 114.537 102.679 114.654 102.735 114.794C102.792 114.93 102.82 115.087 102.82 115.266C102.82 115.286 102.82 115.306 102.82 115.323C102.82 115.338 102.818 115.358 102.815 115.381H100.99C100.993 115.485 101.014 115.582 101.053 115.671C101.094 115.76 101.148 115.837 101.213 115.902C101.281 115.967 101.361 116.019 101.453 116.058C101.548 116.093 101.651 116.111 101.76 116.111C101.933 116.111 102.073 116.077 102.183 116.009C102.296 115.938 102.387 115.843 102.455 115.724L102.757 115.933C102.657 116.096 102.522 116.225 102.352 116.32C102.186 116.415 101.987 116.463 101.756 116.463ZM102.428 115.07C102.413 114.978 102.385 114.896 102.344 114.825C102.305 114.754 102.254 114.693 102.192 114.642C102.133 114.592 102.065 114.553 101.987 114.527C101.91 114.5 101.83 114.487 101.747 114.487C101.664 114.487 101.582 114.5 101.502 114.527C101.422 114.553 101.349 114.592 101.284 114.642C101.219 114.69 101.162 114.751 101.115 114.825C101.068 114.896 101.035 114.978 101.017 115.07H102.428ZM103.456 114.193H103.839V114.536C103.916 114.402 104.017 114.304 104.141 114.242C104.266 114.179 104.401 114.148 104.546 114.148C104.671 114.148 104.785 114.169 104.889 114.211C104.993 114.252 105.08 114.313 105.152 114.393C105.226 114.47 105.284 114.565 105.325 114.678C105.367 114.788 105.387 114.911 105.387 115.047V116.418H105.009V115.105C105.009 114.918 104.96 114.771 104.862 114.665C104.767 114.555 104.641 114.5 104.484 114.5C104.395 114.5 104.31 114.518 104.23 114.553C104.153 114.589 104.085 114.642 104.025 114.714C103.969 114.782 103.923 114.866 103.888 114.967C103.855 115.068 103.839 115.184 103.839 115.314V116.418H103.456V114.193ZM107.007 116.441C106.909 116.441 106.819 116.427 106.735 116.401C106.652 116.371 106.58 116.329 106.517 116.276C106.458 116.22 106.411 116.148 106.375 116.062C106.342 115.976 106.326 115.875 106.326 115.76V114.544H105.854V114.193H106.326V113.574H106.709V114.193H107.35V114.544H106.709V115.711C106.709 115.853 106.74 115.952 106.802 116.009C106.865 116.062 106.957 116.089 107.078 116.089C107.126 116.089 107.173 116.086 107.221 116.08C107.271 116.071 107.314 116.059 107.35 116.044V116.387C107.302 116.402 107.25 116.414 107.194 116.423C107.138 116.435 107.075 116.441 107.007 116.441ZM109.294 113.596C109.216 113.596 109.151 113.571 109.098 113.521C109.044 113.467 109.018 113.402 109.018 113.325C109.018 113.251 109.044 113.187 109.098 113.133C109.151 113.08 109.216 113.053 109.294 113.053C109.371 113.053 109.435 113.08 109.485 113.133C109.535 113.187 109.561 113.251 109.561 113.325C109.561 113.402 109.535 113.467 109.485 113.521C109.435 113.571 109.371 113.596 109.294 113.596ZM109.098 114.193H109.481V116.418H109.098V114.193ZM110.971 116.463C110.772 116.463 110.594 116.421 110.437 116.338C110.28 116.252 110.167 116.122 110.099 115.947L110.41 115.773C110.452 115.886 110.524 115.973 110.628 116.036C110.735 116.095 110.851 116.125 110.975 116.125C111.082 116.125 111.173 116.099 111.247 116.049C111.324 115.995 111.363 115.921 111.363 115.826C111.363 115.746 111.334 115.679 111.278 115.626C111.222 115.573 111.121 115.524 110.975 115.479L110.753 115.408C110.569 115.355 110.429 115.273 110.335 115.163C110.243 115.05 110.197 114.915 110.197 114.758C110.197 114.663 110.216 114.579 110.254 114.504C110.296 114.427 110.351 114.363 110.419 114.313C110.49 114.26 110.572 114.22 110.664 114.193C110.756 114.163 110.855 114.148 110.962 114.148C111.128 114.148 111.274 114.182 111.398 114.251C111.523 114.316 111.622 114.411 111.697 114.536L111.412 114.731C111.361 114.66 111.297 114.601 111.22 114.553C111.146 114.503 111.056 114.478 110.949 114.478C110.854 114.478 110.768 114.501 110.691 114.549C110.616 114.596 110.579 114.662 110.579 114.745C110.579 114.813 110.6 114.874 110.642 114.927C110.686 114.981 110.771 115.027 110.895 115.065L111.14 115.141C111.333 115.2 111.481 115.282 111.585 115.386C111.692 115.49 111.745 115.626 111.745 115.795C111.745 115.902 111.726 115.997 111.688 116.08C111.649 116.163 111.594 116.233 111.523 116.289C111.455 116.346 111.373 116.389 111.278 116.418C111.183 116.448 111.081 116.463 110.971 116.463ZM114.234 116.463C114.035 116.463 113.857 116.421 113.7 116.338C113.543 116.252 113.43 116.122 113.362 115.947L113.673 115.773C113.715 115.886 113.787 115.973 113.891 116.036C113.998 116.095 114.114 116.125 114.238 116.125C114.345 116.125 114.436 116.099 114.51 116.049C114.587 115.995 114.626 115.921 114.626 115.826C114.626 115.746 114.597 115.679 114.541 115.626C114.485 115.573 114.384 115.524 114.238 115.479L114.016 115.408C113.832 115.355 113.692 115.273 113.597 115.163C113.505 115.05 113.459 114.915 113.459 114.758C113.459 114.663 113.479 114.579 113.517 114.504C113.559 114.427 113.614 114.363 113.682 114.313C113.753 114.26 113.835 114.22 113.927 114.193C114.019 114.163 114.118 114.148 114.225 114.148C114.391 114.148 114.537 114.182 114.661 114.251C114.786 114.316 114.885 114.411 114.959 114.536L114.675 114.731C114.624 114.66 114.56 114.601 114.483 114.553C114.409 114.503 114.318 114.478 114.212 114.478C114.117 114.478 114.031 114.501 113.953 114.549C113.879 114.596 113.842 114.662 113.842 114.745C113.842 114.813 113.863 114.874 113.905 114.927C113.949 114.981 114.034 115.027 114.158 115.065L114.403 115.141C114.596 115.2 114.744 115.282 114.848 115.386C114.955 115.49 115.008 115.626 115.008 115.795C115.008 115.902 114.989 115.997 114.951 116.08C114.912 116.163 114.857 116.233 114.786 116.289C114.718 116.346 114.636 116.389 114.541 116.418C114.446 116.448 114.344 116.463 114.234 116.463ZM116.446 116.463C116.325 116.463 116.213 116.442 116.112 116.401C116.011 116.356 115.925 116.295 115.854 116.218C115.783 116.141 115.727 116.047 115.685 115.938C115.646 115.825 115.627 115.699 115.627 115.559V114.193H116.01V115.501C116.01 115.688 116.055 115.837 116.144 115.947C116.236 116.056 116.359 116.111 116.513 116.111C116.599 116.111 116.679 116.093 116.753 116.058C116.83 116.019 116.896 115.966 116.949 115.898C117.006 115.826 117.05 115.74 117.083 115.639C117.115 115.539 117.132 115.424 117.132 115.297V114.193H117.514V116.418H117.132V116.076C117.057 116.206 116.96 116.304 116.838 116.369C116.719 116.432 116.589 116.463 116.446 116.463ZM118.329 117.349V114.193H118.711V114.536C118.786 114.429 118.892 114.338 119.032 114.264C119.171 114.187 119.326 114.148 119.495 114.148C119.649 114.148 119.793 114.179 119.927 114.242C120.06 114.301 120.176 114.384 120.274 114.491C120.372 114.595 120.447 114.717 120.501 114.856C120.557 114.996 120.585 115.145 120.585 115.306C120.585 115.466 120.557 115.616 120.501 115.755C120.447 115.895 120.372 116.018 120.274 116.125C120.176 116.228 120.06 116.312 119.927 116.374C119.793 116.433 119.649 116.463 119.495 116.463C119.326 116.463 119.171 116.426 119.032 116.352C118.892 116.274 118.786 116.182 118.711 116.076V117.349H118.329ZM119.437 116.111C119.55 116.111 119.652 116.09 119.744 116.049C119.836 116.007 119.915 115.951 119.98 115.88C120.048 115.806 120.1 115.72 120.136 115.622C120.174 115.524 120.194 115.418 120.194 115.306C120.194 115.193 120.174 115.087 120.136 114.99C120.1 114.892 120.048 114.807 119.98 114.736C119.915 114.662 119.836 114.604 119.744 114.562C119.652 114.521 119.55 114.5 119.437 114.5C119.324 114.5 119.222 114.521 119.13 114.562C119.038 114.604 118.958 114.662 118.89 114.736C118.824 114.807 118.772 114.892 118.734 114.99C118.698 115.087 118.68 115.193 118.68 115.306C118.68 115.418 118.698 115.524 118.734 115.622C118.772 115.72 118.824 115.806 118.89 115.88C118.958 115.951 119.038 116.007 119.13 116.049C119.222 116.09 119.324 116.111 119.437 116.111ZM121.229 117.349V114.193H121.612V114.536C121.686 114.429 121.793 114.338 121.933 114.264C122.072 114.187 122.226 114.148 122.396 114.148C122.55 114.148 122.694 114.179 122.827 114.242C122.961 114.301 123.077 114.384 123.174 114.491C123.272 114.595 123.348 114.717 123.401 114.856C123.458 114.996 123.486 115.145 123.486 115.306C123.486 115.466 123.458 115.616 123.401 115.755C123.348 115.895 123.272 116.018 123.174 116.125C123.077 116.228 122.961 116.312 122.827 116.374C122.694 116.433 122.55 116.463 122.396 116.463C122.226 116.463 122.072 116.426 121.933 116.352C121.793 116.274 121.686 116.182 121.612 116.076V117.349H121.229ZM122.338 116.111C122.45 116.111 122.553 116.09 122.645 116.049C122.737 116.007 122.815 115.951 122.881 115.88C122.949 115.806 123.001 115.72 123.036 115.622C123.075 115.524 123.094 115.418 123.094 115.306C123.094 115.193 123.075 115.087 123.036 114.99C123.001 114.892 122.949 114.807 122.881 114.736C122.815 114.662 122.737 114.604 122.645 114.562C122.553 114.521 122.45 114.5 122.338 114.5C122.225 114.5 122.123 114.521 122.031 114.562C121.939 114.604 121.858 114.662 121.79 114.736C121.725 114.807 121.673 114.892 121.634 114.99C121.599 115.087 121.581 115.193 121.581 115.306C121.581 115.418 121.599 115.524 121.634 115.622C121.673 115.72 121.725 115.806 121.79 115.88C121.858 115.951 121.939 116.007 122.031 116.049C122.123 116.09 122.225 116.111 122.338 116.111ZM124.13 113.08H124.513V116.418H124.13V113.08ZM125.527 113.596C125.45 113.596 125.385 113.571 125.331 113.521C125.278 113.467 125.251 113.402 125.251 113.325C125.251 113.251 125.278 113.187 125.331 113.133C125.385 113.08 125.45 113.053 125.527 113.053C125.604 113.053 125.668 113.08 125.718 113.133C125.769 113.187 125.794 113.251 125.794 113.325C125.794 113.402 125.769 113.467 125.718 113.521C125.668 113.571 125.604 113.596 125.527 113.596ZM125.331 114.193H125.714V116.418H125.331V114.193ZM127.512 116.463C127.339 116.463 127.182 116.433 127.04 116.374C126.897 116.314 126.776 116.233 126.675 116.129C126.574 116.025 126.495 115.904 126.439 115.764C126.385 115.622 126.359 115.469 126.359 115.306C126.359 115.142 126.387 114.991 126.443 114.852C126.5 114.709 126.578 114.586 126.679 114.482C126.783 114.378 126.906 114.297 127.049 114.237C127.191 114.178 127.347 114.148 127.516 114.148C127.661 114.148 127.798 114.174 127.925 114.224C128.053 114.271 128.164 114.344 128.259 114.442C128.357 114.537 128.434 114.654 128.491 114.794C128.547 114.93 128.575 115.087 128.575 115.266C128.575 115.286 128.575 115.306 128.575 115.323C128.575 115.338 128.574 115.358 128.571 115.381H126.746C126.749 115.485 126.77 115.582 126.808 115.671C126.85 115.76 126.903 115.837 126.969 115.902C127.037 115.967 127.117 116.019 127.209 116.058C127.304 116.093 127.406 116.111 127.516 116.111C127.688 116.111 127.829 116.077 127.939 116.009C128.052 115.938 128.142 115.843 128.21 115.724L128.513 115.933C128.412 116.096 128.277 116.225 128.108 116.32C127.942 116.415 127.743 116.463 127.512 116.463ZM128.184 115.07C128.169 114.978 128.141 114.896 128.099 114.825C128.061 114.754 128.01 114.693 127.948 114.642C127.888 114.592 127.82 114.553 127.743 114.527C127.666 114.5 127.586 114.487 127.503 114.487C127.42 114.487 127.338 114.5 127.258 114.527C127.178 114.553 127.105 114.592 127.04 114.642C126.974 114.69 126.918 114.751 126.871 114.825C126.823 114.896 126.79 114.978 126.773 115.07H128.184ZM130.128 116.463C129.971 116.463 129.826 116.433 129.692 116.374C129.561 116.312 129.447 116.228 129.349 116.125C129.251 116.018 129.174 115.895 129.118 115.755C129.064 115.616 129.038 115.466 129.038 115.306C129.038 115.145 129.064 114.996 129.118 114.856C129.174 114.717 129.251 114.595 129.349 114.491C129.447 114.384 129.561 114.301 129.692 114.242C129.826 114.179 129.971 114.148 130.128 114.148C130.297 114.148 130.452 114.187 130.591 114.264C130.731 114.338 130.837 114.429 130.912 114.536V113.08H131.294V116.418H130.912V116.076C130.837 116.182 130.731 116.274 130.591 116.352C130.452 116.426 130.297 116.463 130.128 116.463ZM130.186 116.111C130.299 116.111 130.401 116.09 130.493 116.049C130.585 116.007 130.664 115.951 130.729 115.88C130.797 115.806 130.849 115.72 130.885 115.622C130.923 115.524 130.943 115.418 130.943 115.306C130.943 115.193 130.923 115.087 130.885 114.99C130.849 114.892 130.797 114.807 130.729 114.736C130.664 114.662 130.585 114.604 130.493 114.562C130.401 114.521 130.299 114.5 130.186 114.5C130.073 114.5 129.969 114.521 129.875 114.562C129.783 114.604 129.702 114.662 129.634 114.736C129.569 114.807 129.517 114.892 129.478 114.99C129.443 115.087 129.425 115.193 129.425 115.306C129.425 115.418 129.443 115.524 129.478 115.622C129.517 115.72 129.569 115.806 129.634 115.88C129.702 115.951 129.783 116.007 129.875 116.049C129.969 116.09 130.073 116.111 130.186 116.111ZM134.44 116.463C134.271 116.463 134.117 116.426 133.977 116.352C133.838 116.274 133.731 116.182 133.657 116.076V116.418H133.274V113.08H133.657V114.536C133.731 114.429 133.838 114.338 133.977 114.264C134.117 114.187 134.271 114.148 134.44 114.148C134.595 114.148 134.738 114.179 134.872 114.242C135.005 114.301 135.121 114.384 135.219 114.491C135.317 114.595 135.393 114.717 135.446 114.856C135.503 114.996 135.531 115.145 135.531 115.306C135.531 115.466 135.503 115.616 135.446 115.755C135.393 115.895 135.317 116.018 135.219 116.125C135.121 116.228 135.005 116.312 134.872 116.374C134.738 116.433 134.595 116.463 134.44 116.463ZM134.382 116.111C134.495 116.111 134.597 116.09 134.689 116.049C134.781 116.007 134.86 115.951 134.925 115.88C134.994 115.806 135.046 115.72 135.081 115.622C135.12 115.524 135.139 115.418 135.139 115.306C135.139 115.193 135.12 115.087 135.081 114.99C135.046 114.892 134.994 114.807 134.925 114.736C134.86 114.662 134.781 114.604 134.689 114.562C134.597 114.521 134.495 114.5 134.382 114.5C134.27 114.5 134.167 114.521 134.075 114.562C133.983 114.604 133.903 114.662 133.835 114.736C133.77 114.807 133.718 114.892 133.679 114.99C133.643 115.087 133.626 115.193 133.626 115.306C133.626 115.418 133.643 115.524 133.679 115.622C133.718 115.72 133.77 115.806 133.835 115.88C133.903 115.951 133.983 116.007 134.075 116.049C134.167 116.09 134.27 116.111 134.382 116.111ZM136.292 117.349L136.777 116.303L135.802 114.193H136.225L136.99 115.884L137.752 114.193H138.179L136.719 117.349H136.292Z" fill="#535A61"/>
+<path d="M141.193 116.08C141.366 116.08 141.526 116.049 141.674 115.987C141.826 115.921 141.955 115.832 142.061 115.72C142.171 115.607 142.257 115.476 142.32 115.328C142.382 115.177 142.413 115.013 142.413 114.838C142.413 114.666 142.382 114.504 142.32 114.353C142.257 114.202 142.171 114.07 142.061 113.957C141.955 113.844 141.826 113.757 141.674 113.694C141.526 113.629 141.366 113.596 141.193 113.596C141.021 113.596 140.861 113.629 140.713 113.694C140.564 113.757 140.435 113.844 140.326 113.957C140.219 114.07 140.134 114.202 140.072 114.353C140.009 114.504 139.978 114.666 139.978 114.838C139.978 115.013 140.009 115.177 140.072 115.328C140.134 115.476 140.219 115.607 140.326 115.72C140.435 115.832 140.564 115.921 140.713 115.987C140.861 116.049 141.021 116.08 141.193 116.08ZM141.193 116.472C140.965 116.472 140.751 116.43 140.553 116.347C140.357 116.261 140.185 116.145 140.036 116C139.888 115.852 139.771 115.678 139.685 115.479C139.601 115.28 139.56 115.067 139.56 114.838C139.56 114.61 139.601 114.396 139.685 114.197C139.771 113.998 139.888 113.826 140.036 113.681C140.185 113.533 140.357 113.417 140.553 113.334C140.751 113.248 140.965 113.205 141.193 113.205C141.422 113.205 141.636 113.248 141.834 113.334C142.033 113.417 142.205 113.533 142.351 113.681C142.499 113.826 142.615 113.998 142.698 114.197C142.784 114.396 142.827 114.61 142.827 114.838C142.827 115.067 142.784 115.28 142.698 115.479C142.615 115.678 142.499 115.852 142.351 116C142.205 116.145 142.033 116.261 141.834 116.347C141.636 116.43 141.422 116.472 141.193 116.472ZM143.482 117.349V114.193H143.864V114.536C143.938 114.429 144.045 114.338 144.185 114.264C144.324 114.187 144.479 114.148 144.648 114.148C144.802 114.148 144.946 114.179 145.079 114.242C145.213 114.301 145.329 114.384 145.427 114.491C145.525 114.595 145.6 114.717 145.654 114.856C145.71 114.996 145.738 115.145 145.738 115.306C145.738 115.466 145.71 115.616 145.654 115.755C145.6 115.895 145.525 116.018 145.427 116.125C145.329 116.228 145.213 116.312 145.079 116.374C144.946 116.433 144.802 116.463 144.648 116.463C144.479 116.463 144.324 116.426 144.185 116.352C144.045 116.274 143.938 116.182 143.864 116.076V117.349H143.482ZM144.59 116.111C144.703 116.111 144.805 116.09 144.897 116.049C144.989 116.007 145.068 115.951 145.133 115.88C145.201 115.806 145.253 115.72 145.289 115.622C145.327 115.524 145.346 115.418 145.346 115.306C145.346 115.193 145.327 115.087 145.289 114.99C145.253 114.892 145.201 114.807 145.133 114.736C145.068 114.662 144.989 114.604 144.897 114.562C144.805 114.521 144.703 114.5 144.59 114.5C144.477 114.5 144.375 114.521 144.283 114.562C144.191 114.604 144.111 114.662 144.042 114.736C143.977 114.807 143.925 114.892 143.887 114.99C143.851 115.087 143.833 115.193 143.833 115.306C143.833 115.418 143.851 115.524 143.887 115.622C143.925 115.72 143.977 115.806 144.042 115.88C144.111 115.951 144.191 116.007 144.283 116.049C144.375 116.09 144.477 116.111 144.59 116.111ZM147.361 116.463C147.189 116.463 147.032 116.433 146.89 116.374C146.747 116.314 146.626 116.233 146.525 116.129C146.424 116.025 146.345 115.904 146.289 115.764C146.235 115.622 146.209 115.469 146.209 115.306C146.209 115.142 146.237 114.991 146.293 114.852C146.35 114.709 146.428 114.586 146.529 114.482C146.633 114.378 146.756 114.297 146.899 114.237C147.041 114.178 147.197 114.148 147.366 114.148C147.511 114.148 147.648 114.174 147.775 114.224C147.903 114.271 148.014 114.344 148.109 114.442C148.207 114.537 148.284 114.654 148.341 114.794C148.397 114.93 148.425 115.087 148.425 115.266C148.425 115.286 148.425 115.306 148.425 115.323C148.425 115.338 148.424 115.358 148.421 115.381H146.596C146.599 115.485 146.62 115.582 146.658 115.671C146.7 115.76 146.753 115.837 146.818 115.902C146.887 115.967 146.967 116.019 147.059 116.058C147.154 116.093 147.256 116.111 147.366 116.111C147.538 116.111 147.679 116.077 147.789 116.009C147.901 115.938 147.992 115.843 148.06 115.724L148.363 115.933C148.262 116.096 148.127 116.225 147.958 116.32C147.792 116.415 147.593 116.463 147.361 116.463ZM148.034 115.07C148.019 114.978 147.991 114.896 147.949 114.825C147.91 114.754 147.86 114.693 147.798 114.642C147.738 114.592 147.67 114.553 147.593 114.527C147.516 114.5 147.436 114.487 147.353 114.487C147.269 114.487 147.188 114.5 147.108 114.527C147.028 114.553 146.955 114.592 146.89 114.642C146.824 114.69 146.768 114.751 146.72 114.825C146.673 114.896 146.64 114.978 146.623 115.07H148.034ZM149.061 114.193H149.444V114.536C149.521 114.402 149.622 114.304 149.747 114.242C149.871 114.179 150.006 114.148 150.152 114.148C150.276 114.148 150.391 114.169 150.494 114.211C150.598 114.252 150.686 114.313 150.757 114.393C150.831 114.47 150.889 114.565 150.931 114.678C150.972 114.788 150.993 114.911 150.993 115.047V116.418H150.615V115.105C150.615 114.918 150.566 114.771 150.468 114.665C150.373 114.555 150.247 114.5 150.089 114.5C150 114.5 149.916 114.518 149.836 114.553C149.759 114.589 149.69 114.642 149.631 114.714C149.575 114.782 149.529 114.866 149.493 114.967C149.46 115.068 149.444 115.184 149.444 115.314V116.418H149.061V114.193ZM152.683 116.472C152.552 116.472 152.429 116.457 152.314 116.427C152.198 116.401 152.091 116.362 151.993 116.312C151.898 116.258 151.815 116.197 151.744 116.129C151.673 116.058 151.616 115.982 151.575 115.902L151.909 115.653C151.995 115.786 152.101 115.892 152.229 115.969C152.36 116.046 152.514 116.085 152.692 116.085C152.855 116.085 152.993 116.043 153.106 115.96C153.219 115.877 153.275 115.761 153.275 115.613C153.275 115.485 153.236 115.378 153.159 115.292C153.082 115.206 152.969 115.135 152.821 115.079L152.403 114.918C152.153 114.826 151.971 114.712 151.855 114.576C151.742 114.439 151.686 114.263 151.686 114.046C151.686 113.918 151.711 113.803 151.762 113.699C151.812 113.595 151.88 113.506 151.966 113.432C152.055 113.358 152.159 113.301 152.278 113.263C152.4 113.224 152.532 113.205 152.674 113.205C152.873 113.205 153.051 113.245 153.208 113.325C153.368 113.405 153.498 113.509 153.595 113.636L153.293 113.904C153.213 113.809 153.122 113.733 153.021 113.677C152.92 113.62 152.802 113.592 152.665 113.592C152.588 113.592 152.514 113.602 152.443 113.623C152.374 113.644 152.314 113.674 152.26 113.712C152.21 113.751 152.17 113.797 152.14 113.85C152.11 113.904 152.095 113.963 152.095 114.028C152.095 114.162 152.134 114.266 152.211 114.34C152.291 114.411 152.411 114.476 152.572 114.536L152.955 114.682C153.189 114.771 153.37 114.887 153.498 115.03C153.625 115.172 153.689 115.36 153.689 115.595C153.689 115.728 153.664 115.85 153.613 115.96C153.563 116.067 153.493 116.159 153.404 116.236C153.315 116.31 153.208 116.368 153.084 116.409C152.962 116.451 152.828 116.472 152.683 116.472ZM155.312 116.463C155.139 116.463 154.982 116.433 154.84 116.374C154.697 116.314 154.576 116.233 154.475 116.129C154.374 116.025 154.295 115.904 154.239 115.764C154.185 115.622 154.159 115.469 154.159 115.306C154.159 115.142 154.187 114.991 154.243 114.852C154.3 114.709 154.378 114.586 154.479 114.482C154.583 114.378 154.706 114.297 154.849 114.237C154.991 114.178 155.147 114.148 155.316 114.148C155.461 114.148 155.598 114.174 155.725 114.224C155.853 114.271 155.964 114.344 156.059 114.442C156.157 114.537 156.234 114.654 156.291 114.794C156.347 114.93 156.375 115.087 156.375 115.266C156.375 115.286 156.375 115.306 156.375 115.323C156.375 115.338 156.374 115.358 156.371 115.381H154.546C154.549 115.485 154.57 115.582 154.608 115.671C154.65 115.76 154.703 115.837 154.768 115.902C154.837 115.967 154.917 116.019 155.009 116.058C155.104 116.093 155.206 116.111 155.316 116.111C155.488 116.111 155.629 116.077 155.739 116.009C155.852 115.938 155.942 115.843 156.01 115.724L156.313 115.933C156.212 116.096 156.077 116.225 155.908 116.32C155.742 116.415 155.543 116.463 155.312 116.463ZM155.984 115.07C155.969 114.978 155.941 114.896 155.899 114.825C155.86 114.754 155.81 114.693 155.748 114.642C155.688 114.592 155.62 114.553 155.543 114.527C155.466 114.5 155.386 114.487 155.303 114.487C155.22 114.487 155.138 114.5 155.058 114.527C154.978 114.553 154.905 114.592 154.84 114.642C154.774 114.69 154.718 114.751 154.671 114.825C154.623 114.896 154.59 114.978 154.573 115.07H155.984ZM157.928 116.463C157.771 116.463 157.626 116.433 157.492 116.374C157.361 116.312 157.247 116.228 157.149 116.125C157.051 116.018 156.974 115.895 156.918 115.755C156.864 115.616 156.838 115.466 156.838 115.306C156.838 115.145 156.864 114.996 156.918 114.856C156.974 114.717 157.051 114.595 157.149 114.491C157.247 114.384 157.361 114.301 157.492 114.242C157.626 114.179 157.771 114.148 157.928 114.148C158.097 114.148 158.252 114.187 158.391 114.264C158.531 114.338 158.637 114.429 158.712 114.536V114.193H159.094V116.418H158.712V116.076C158.637 116.182 158.531 116.274 158.391 116.352C158.252 116.426 158.097 116.463 157.928 116.463ZM157.986 116.111C158.099 116.111 158.201 116.09 158.293 116.049C158.385 116.007 158.464 115.951 158.529 115.88C158.597 115.806 158.649 115.72 158.685 115.622C158.723 115.524 158.743 115.418 158.743 115.306C158.743 115.193 158.723 115.087 158.685 114.99C158.649 114.892 158.597 114.807 158.529 114.736C158.464 114.662 158.385 114.604 158.293 114.562C158.201 114.521 158.099 114.5 157.986 114.5C157.873 114.5 157.769 114.521 157.675 114.562C157.583 114.604 157.502 114.662 157.434 114.736C157.369 114.807 157.317 114.892 157.278 114.99C157.243 115.087 157.225 115.193 157.225 115.306C157.225 115.418 157.243 115.524 157.278 115.622C157.317 115.72 157.369 115.806 157.434 115.88C157.502 115.951 157.583 116.007 157.675 116.049C157.769 116.09 157.873 116.111 157.986 116.111Z" fill="#037DD6"/>
+</g>
+<g style="mix-blend-mode:multiply" filter="url(#filter1_i_4806_28636)">
+<path d="M150.528 171.252C195.797 154.113 221.158 106.134 221.158 72.1851C221.158 13.6459 161.529 2.73489 140.607 11.1653C138.289 12.0992 121.333 -12.3547 42.3348 11.1653C20.7826 17.582 28.1328 91.4057 19.7638 91.925C11.3949 92.4444 2.54946 119.706 13.4545 141.908C24.3596 164.111 98.2856 191.031 150.528 171.252Z" fill="white"/>
+</g>
+</g>
+<path d="M53.0979 59.9583C53.0979 58.9309 53.9309 58.0979 54.9583 58.0979H192.042C193.069 58.0979 193.902 58.9309 193.902 59.9583V66.9104H53.0979V59.9583Z" fill="#D4D4D4" stroke="#BEBEBE" stroke-width="0.195833"/>
+<path d="M112.853 60.2626H113.595L114.692 63.4929L115.782 60.2626H116.516V64.0833H116.024V61.8283C116.024 61.7503 116.026 61.6211 116.029 61.4408C116.033 61.2605 116.034 61.0671 116.034 60.8608L114.945 64.0833H114.432L113.335 60.8608V60.9778C113.335 61.0715 113.336 61.2145 113.34 61.407C113.345 61.5977 113.348 61.7382 113.348 61.8283V64.0833H112.853V60.2626ZM118.401 61.2353C118.599 61.2353 118.79 61.2821 118.976 61.3758C119.162 61.4677 119.303 61.5873 119.4 61.7347C119.494 61.8752 119.556 62.039 119.587 62.2263C119.615 62.3546 119.629 62.5592 119.629 62.8401H117.587C117.596 63.1227 117.663 63.3499 117.787 63.5215C117.912 63.6915 118.106 63.7764 118.367 63.7764C118.612 63.7764 118.807 63.6958 118.953 63.5345C119.036 63.4409 119.095 63.3325 119.129 63.2094H119.59C119.578 63.3117 119.537 63.4262 119.468 63.5527C119.4 63.6776 119.324 63.7799 119.239 63.8596C119.096 63.9984 118.92 64.092 118.711 64.1405C118.598 64.1683 118.471 64.1822 118.328 64.1822C117.982 64.1822 117.688 64.0565 117.447 63.805C117.206 63.5519 117.085 63.1982 117.085 62.7439C117.085 62.2965 117.206 61.9332 117.449 61.6541C117.692 61.3749 118.009 61.2353 118.401 61.2353ZM119.148 62.4682C119.129 62.2653 119.084 62.1032 119.015 61.9818C118.887 61.7564 118.673 61.6437 118.373 61.6437C118.158 61.6437 117.977 61.7217 117.832 61.8778C117.686 62.0321 117.609 62.2289 117.6 62.4682H119.148ZM120.3 60.5201H120.773V61.2978H121.218V61.6801H120.773V63.4981C120.773 63.5952 120.806 63.6602 120.872 63.6932C120.908 63.7123 120.969 63.7218 121.054 63.7218C121.077 63.7218 121.101 63.7218 121.127 63.7218C121.153 63.7201 121.183 63.7175 121.218 63.714V64.0833C121.164 64.0989 121.108 64.1102 121.049 64.1171C120.992 64.1241 120.929 64.1275 120.862 64.1275C120.643 64.1275 120.495 64.0721 120.417 63.9611C120.339 63.8484 120.3 63.7027 120.3 63.5241V61.6801H119.923V61.2978H120.3V60.5201ZM122.048 63.3421C122.048 63.4773 122.097 63.584 122.196 63.662C122.295 63.74 122.412 63.779 122.547 63.779C122.712 63.779 122.871 63.7409 123.026 63.6646C123.286 63.538 123.416 63.3308 123.416 63.043V62.6658C123.359 62.7022 123.285 62.7326 123.195 62.7569C123.104 62.7811 123.016 62.7985 122.929 62.8089L122.646 62.8453C122.476 62.8678 122.348 62.9034 122.264 62.9519C122.12 63.0334 122.048 63.1635 122.048 63.3421ZM123.182 62.3953C123.289 62.3815 123.361 62.3364 123.398 62.2601C123.418 62.2185 123.429 62.1587 123.429 62.0806C123.429 61.9211 123.372 61.8058 123.257 61.7347C123.144 61.6619 122.982 61.6255 122.771 61.6255C122.526 61.6255 122.353 61.6914 122.251 61.8231C122.193 61.896 122.156 62.0043 122.139 62.1483H121.702C121.71 61.8049 121.821 61.5665 122.035 61.433C122.25 61.2978 122.498 61.2301 122.781 61.2301C123.109 61.2301 123.375 61.2926 123.58 61.4174C123.782 61.5422 123.884 61.7364 123.884 62V63.6048C123.884 63.6533 123.893 63.6923 123.913 63.7218C123.933 63.7513 123.976 63.766 124.04 63.766C124.061 63.766 124.084 63.7652 124.11 63.7634C124.136 63.7599 124.164 63.7556 124.193 63.7504V64.0963C124.121 64.1171 124.065 64.1301 124.027 64.1353C123.989 64.1405 123.937 64.1431 123.871 64.1431C123.71 64.1431 123.593 64.0859 123.52 63.9715C123.482 63.9108 123.455 63.825 123.439 63.714C123.344 63.8388 123.207 63.9472 123.028 64.0391C122.85 64.131 122.653 64.177 122.438 64.177C122.179 64.177 121.968 64.0989 121.803 63.9429C121.64 63.7851 121.559 63.5883 121.559 63.3525C121.559 63.0941 121.639 62.8938 121.801 62.7517C121.962 62.6095 122.173 62.5219 122.435 62.489L123.182 62.3953ZM124.703 60.2626H125.444L126.542 63.4929L127.632 60.2626H128.365V64.0833H127.874V61.8283C127.874 61.7503 127.875 61.6211 127.879 61.4408C127.882 61.2605 127.884 61.0671 127.884 60.8608L126.794 64.0833H126.282L125.184 60.8608V60.9778C125.184 61.0715 125.186 61.2145 125.19 61.407C125.195 61.5977 125.197 61.7382 125.197 61.8283V64.0833H124.703V60.2626ZM129.45 63.3421C129.45 63.4773 129.499 63.584 129.598 63.662C129.697 63.74 129.814 63.779 129.949 63.779C130.114 63.779 130.273 63.7409 130.428 63.6646C130.688 63.538 130.818 63.3308 130.818 63.043V62.6658C130.761 62.7022 130.687 62.7326 130.597 62.7569C130.507 62.7811 130.418 62.7985 130.332 62.8089L130.048 62.8453C129.878 62.8678 129.751 62.9034 129.666 62.9519C129.522 63.0334 129.45 63.1635 129.45 63.3421ZM130.584 62.3953C130.691 62.3815 130.763 62.3364 130.8 62.2601C130.821 62.2185 130.831 62.1587 130.831 62.0806C130.831 61.9211 130.774 61.8058 130.659 61.7347C130.547 61.6619 130.384 61.6255 130.173 61.6255C129.928 61.6255 129.755 61.6914 129.653 61.8231C129.595 61.896 129.558 62.0043 129.541 62.1483H129.104C129.113 61.8049 129.224 61.5665 129.437 61.433C129.652 61.2978 129.901 61.2301 130.183 61.2301C130.511 61.2301 130.777 61.2926 130.982 61.4174C131.185 61.5422 131.286 61.7364 131.286 62V63.6048C131.286 63.6533 131.296 63.6923 131.315 63.7218C131.336 63.7513 131.378 63.766 131.442 63.766C131.463 63.766 131.486 63.7652 131.512 63.7634C131.538 63.7599 131.566 63.7556 131.596 63.7504V64.0963C131.523 64.1171 131.467 64.1301 131.429 64.1353C131.391 64.1405 131.339 64.1431 131.273 64.1431C131.112 64.1431 130.995 64.0859 130.922 63.9715C130.884 63.9108 130.857 63.825 130.841 63.714C130.746 63.8388 130.609 63.9472 130.43 64.0391C130.252 64.131 130.055 64.177 129.84 64.177C129.582 64.177 129.37 64.0989 129.205 63.9429C129.042 63.7851 128.961 63.5883 128.961 63.3525C128.961 63.0941 129.042 62.8938 129.203 62.7517C129.364 62.6095 129.576 62.5219 129.837 62.489L130.584 62.3953ZM132.334 63.2094C132.348 63.3655 132.387 63.4851 132.451 63.5683C132.569 63.7192 132.774 63.7946 133.065 63.7946C133.239 63.7946 133.391 63.7573 133.523 63.6828C133.655 63.6065 133.721 63.4895 133.721 63.3317C133.721 63.212 133.668 63.121 133.562 63.0586C133.494 63.0204 133.361 62.9762 133.161 62.9259L132.789 62.8323C132.552 62.7733 132.377 62.7074 132.264 62.6346C132.063 62.508 131.962 62.3329 131.962 62.1092C131.962 61.8457 132.057 61.6324 132.246 61.4694C132.437 61.3064 132.692 61.2249 133.013 61.2249C133.433 61.2249 133.735 61.348 133.921 61.5943C134.037 61.7503 134.093 61.9185 134.09 62.0988H133.648C133.639 61.9931 133.602 61.8968 133.536 61.8101C133.428 61.687 133.242 61.6255 132.977 61.6255C132.8 61.6255 132.665 61.6593 132.574 61.7269C132.483 61.7945 132.438 61.8838 132.438 61.9948C132.438 62.1162 132.498 62.2133 132.618 62.2861C132.687 62.3294 132.789 62.3676 132.925 62.4005L133.234 62.476C133.571 62.5575 133.796 62.6364 133.91 62.7126C134.092 62.8323 134.184 63.0204 134.184 63.277C134.184 63.525 134.089 63.7391 133.9 63.9195C133.713 64.0998 133.427 64.19 133.042 64.19C132.627 64.19 132.333 64.0963 132.16 63.9091C131.988 63.7201 131.896 63.4869 131.884 63.2094H132.334ZM134.709 60.2626H135.159V62.4812L136.36 61.2978H136.959L135.892 62.3407L137.018 64.0833H136.42L135.552 62.6788L135.159 63.0378V64.0833H134.709V60.2626Z" fill="black"/>
+<circle cx="74.3459" cy="62.5042" r="2.35" fill="#29CA42" stroke="#1AAA26" stroke-width="0.391667"/>
+<circle cx="66.5124" cy="62.5042" r="2.35" fill="#FFBD2E" stroke="#DEA42B" stroke-width="0.391667"/>
+<circle cx="58.6791" cy="62.5042" r="2.35" fill="#FF5F57" stroke="#E0423D" stroke-width="0.391667"/>
+<path d="M222.363 35.755C224.574 29.2204 197.714 41.2126 204.367 51.6178C211.02 62.023 230.114 67.0699 221.346 57.4754C213.929 49.3667 218.835 46.1858 222.363 35.755Z" fill="#B9E0FF"/>
+<path d="M42.603 126.258C42.3811 126.888 41.6799 127.216 41.0497 126.994C38.52 126.098 37.6235 124.394 36.8957 123.028C36.2389 121.785 35.7152 120.8 34.082 120.214C32.4488 119.638 31.4192 120.064 30.1233 120.614C28.7032 121.217 26.928 121.963 24.3983 121.066C21.8687 120.17 20.9722 118.466 20.2533 117.1C19.5964 115.857 19.0728 114.872 17.4396 114.287C15.8064 113.71 14.7768 114.136 13.4809 114.686C12.0607 115.289 10.2855 116.044 7.76477 115.139C5.23511 114.242 4.33864 112.538 3.61968 111.172C2.96286 109.929 2.43918 108.944 0.806003 108.359C0.175809 108.137 -0.152603 107.436 0.0692966 106.806C0.291196 106.176 0.992398 105.847 1.62259 106.069C4.15225 106.966 5.04872 108.669 5.76767 110.036C6.42449 111.278 6.94818 112.263 8.58136 112.849C10.2145 113.426 11.2441 113 12.54 112.45C13.9602 111.846 15.7354 111.101 18.2562 111.997C20.7858 112.893 21.6823 114.597 22.4012 115.964C23.0581 117.206 23.5818 118.191 25.2149 118.777C26.8481 119.354 27.8777 118.928 29.1736 118.378C30.5938 117.774 32.369 117.029 34.8986 117.925C37.4283 118.821 38.3247 120.525 39.0526 121.892C39.7094 123.134 40.2331 124.119 41.8663 124.705C42.4965 124.927 42.8249 125.619 42.603 126.258Z" fill="#83FEB9"/>
+<path d="M34.9703 57.9076C30.6654 57.9076 27.1594 54.4023 27.1594 50.0984C27.1594 45.7945 30.6654 42.2892 34.9703 42.2892C39.2751 42.2892 42.7811 45.7945 42.7811 50.0984C42.7811 54.4023 39.2751 57.9076 34.9703 57.9076ZM34.9703 44.2415C31.7394 44.2415 29.1121 46.8682 29.1121 50.0984C29.1121 53.3286 31.7394 55.9553 34.9703 55.9553C38.2011 55.9553 40.8284 53.3286 40.8284 50.0984C40.8284 46.8682 38.2011 44.2415 34.9703 44.2415Z" fill="#FFD33D"/>
+<path d="M24.4507 78.9591C25.2792 78.9591 25.9508 78.2877 25.9508 77.4594C25.9508 76.6312 25.2792 75.9597 24.4507 75.9597C23.6223 75.9597 22.9507 76.6312 22.9507 77.4594C22.9507 78.2877 23.6223 78.9591 24.4507 78.9591Z" fill="url(#paint1_linear_4806_28636)"/>
+<path d="M269.5 63.9994C270.328 63.9994 271 63.328 271 62.4997C271 61.6714 270.328 61 269.5 61C268.672 61 268 61.6714 268 62.4997C268 63.328 268.672 63.9994 269.5 63.9994Z" fill="#FFD33D"/>
+<path d="M93.7233 17.0986C90.9362 17.0986 88.6729 14.8358 88.6729 12.0493C88.6729 9.26288 90.9362 7 93.7233 7C96.5103 7 98.7737 9.26288 98.7737 12.0493C98.7737 14.8358 96.5014 17.0986 93.7233 17.0986ZM93.7233 8.63282C91.8416 8.63282 90.306 10.168 90.306 12.0493C90.306 13.9306 91.8416 15.4658 93.7233 15.4658C95.605 15.4658 97.1405 13.9306 97.1405 12.0493C97.1405 10.168 95.605 8.63282 93.7233 8.63282Z" fill="#86E29B"/>
+<path d="M254.05 137.099C251.263 137.099 249 134.836 249 132.049C249 129.263 251.263 127 254.05 127C256.837 127 259.101 129.263 259.101 132.049C259.101 134.836 256.829 137.099 254.05 137.099ZM254.05 128.633C252.169 128.633 250.633 130.168 250.633 132.049C250.633 133.931 252.169 135.466 254.05 135.466C255.932 135.466 257.468 133.931 257.468 132.049C257.468 130.168 255.932 128.633 254.05 128.633Z" fill="#86E29B"/>
+<path d="M176.125 164.812C175.904 164.812 175.683 164.757 175.49 164.66L162.747 158.055C162.291 157.821 162.014 157.365 162.001 156.853C161.987 156.342 162.249 155.872 162.692 155.61L181.972 144.196C182.483 143.892 183.119 143.947 183.575 144.321C184.031 144.694 184.197 145.315 183.99 145.868L177.425 163.887C177.286 164.26 176.996 164.564 176.623 164.702C176.471 164.785 176.291 164.812 176.125 164.812ZM166.257 156.729L175.365 161.455L180.051 148.59L166.257 156.729Z" fill="url(#paint2_linear_4806_28636)"/>
+<defs>
+<filter id="filter0_d_4806_28636" x="35.7548" y="41.262" width="175.49" height="283.49" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.507212"/>
+<feGaussianBlur stdDeviation="8.6226"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.18 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4806_28636"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4806_28636" result="shape"/>
+</filter>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_4806_28636" transform="translate(-0.0821918 -0.0400071) scale(0.00267674 0.00151475)"/>
+</pattern>
+<pattern id="pattern1" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image1_4806_28636" transform="translate(0 -0.0223214) scale(0.000625 0.00116071)"/>
+</pattern>
+<filter id="filter1_i_4806_28636" x="8.38379" y="-3.39487" width="212.774" height="181.531" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-4.3113"/>
+<feGaussianBlur stdDeviation="5.57933"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.14 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4806_28636"/>
+</filter>
+<linearGradient id="paint0_linear_4806_28636" x1="-0.14423" y1="143.14" x2="221" y2="21.2827" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FFC87D"/>
+<stop offset="0.260417" stop-color="#FAB482"/>
+<stop offset="0.84375" stop-color="#FD6C73"/>
+<stop offset="1" stop-color="#D34676"/>
+</linearGradient>
+<linearGradient id="paint1_linear_4806_28636" x1="22.9458" y1="77.4631" x2="25.9499" y2="77.4631" gradientUnits="userSpaceOnUse">
+<stop stop-color="#75C4FD"/>
+<stop offset="1" stop-color="#75C4FD"/>
+</linearGradient>
+<linearGradient id="paint2_linear_4806_28636" x1="169.297" y1="162.715" x2="176.01" y2="141.819" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FFE566"/>
+<stop offset="1" stop-color="#FFB0EB"/>
+</linearGradient>
+<clipPath id="clip0_4806_28636">
+<rect x="63" y="78" width="121.29" height="45.8694" rx="1.48367" fill="white"/>
+</clipPath>
+<image id="image0_4806_28636" width="435" height="713" xlink:href="data:image/png;base64,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"/>
+<image id="image1_4806_28636" width="1600" height="900" xlink:href="data:image/png;base64,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tdq9unqX4a6lNWiNtKZnd+ruy3sC9jTWOtRuqdOtK9sL9kr3Pt+Xtu/G/rD9LQeYB2oPWh6sPEQ/VFqP1E+t72vIauhqTG7saAptamn2aj502PHwjiOmRyqO6hxdeoxybP6xgePFx/tPiE/0nsw8+ahlYsudU0mnrrVGt7afDjt97kzQmVNnWWePn/M+d+S85/mmC8wLDRfdLta3ubYd+t3190Ptbu31l9wvNV72uNzcMabj2BXfKyevBlw9c41z7eL1iOsdN+Jv3OxM7ey6yb/57FburVe3i25/vjP7LuFu6T2Ne+X3De9X/WH7R12XW9fRBwEP2h7GPrzziPfoxeOCx1+65z+hPil/avK0+pnzsyM9QT2Xn4973v1C/OJzb8mfmn9WvrR5efAvv7/a+pL6ul9JXg28XvxG/82Oty5vW/qj+u+/y3v3+X3pB/0POz8yP579lPjp6efJX0hf1n61/dr8Lezb3YG8gQExV8KV/wpgsKIZGQC83gEANRkAOjyfUcYpzn/ygijOrHIE/hNWnBHlxQ2AWvj/Ht0L/246Adi7DR6/oL56KgBRVADiPAA6evRQHTyryc+VskKE54DNnK/peeng3xTFmfOHuH9ugUzVBfzc/guoL3xYVt1q+wAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAGQKADAAQAAAABAAADhAAAAADx5OC6AABAAElEQVR4AezdXawkR70g+KzT9NAeWbdtYUGv3Dbu1h246xkwLe2DQYtHDRrBagdbaHSRbgNaC16aB8beka4f1/LTleyXvuLBfgF5ZfsgXZ4Ms6vlAXvUlgzzAliasQBpu/11x23rWrRn2XHvbfepjciqrFPno86pj8ysiMxfSd1VpyozMuIXWVmZ8c+IKAoPAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBxQUGi69iDQL9FLjrsddfKIrB2RRLf2XzW6ev/f7i5RTzJk8ECBAgQIAAAQIECBAgQIAAAQIECBBYh8BH1rFR2ySQosCxT993KsV8zZOnE+eeuf/K5rd/OmtZwZFZMt4nQIAAAQIECBAgQIAAAQIECBAgQKCrAnqAdLVmletAgRjsiEGB6ecQRPhhqj08DizMHB9WPUSmyysoMgecRQgQIECAAAECBAgQIECAAAECBAgQyFZAACTbqpPxZQTCMFYPhSDHhWXW7eo6rz16p+NAVytXuQgQIECAAAECBAgQIECAAAECBAj0WEDDZ48rv8tFjz0dtnt0DF8c9eyonrtc8mXKVrlMnh9+7dFP/u0yKVmHAAECBAgQIECAAAECBAgQIECAAAECqQgIgKRSE/KxksCoZ0fxwM5E0pywfGceU/0rBkN2PsIcI981bNZOE38RIECAAAECBAgQIECAAAECBAgQIJCugABIunUjZ4cIhKDHC2GR58O/EPgQ7DiEq4aPJ0GRaF7oJVIDqSQIECBAgAABAgQIECBAgAABAgQIEGhMQACkMVoJ1ykw7uExnaSgx7TGWl4PH642KxhSSXgmQIAAAQIECBAgQIAAAQIECBAgQCAVAQGQVGpCPvYI7Ax6mLh8D1BSb2wHQ8JQWT81VFZSlSMzBAgQIECAAAECBAgQIECAAAECBHopIADSy2pPt9Bx8vKYuzCB+f1hWKsL6eZUzmYLDF+M84VUnwuGVBKeCRAgQIAAAQIECBAgQIAAAQIECBBoU0AApE1t25opEAMfsaF8NK+H+TxmQmX4wWuP3lkeZ6o6zrAIskyAAAECBAgQIECAAAECBAgQIECAQIYCAiAZVlrXsnzXY28Mu1Ym5ZklMHzYfCGzbLxPgAABAgQIECBAgAABAgQIECBAgECdAgIgdWpKay6B8dwe40nMhy+Goa7OzrWihToiUNX58MUQDPlSRwqlGAQIECBAgAABAgQIECBAgAABAgQIJCYgAJJYhXQ5O9uBj1hKQY8u1/X8ZYvBkKIQCJlfzJIECBAgQIAAAQIECBAgQIAAAQIECMwnIAAyn5OlVhDYDnwIeqzA2PFVR4GQOHm6SdM7XtWKR4AAAQIECBAgQIAAAQIECBAgQKAlAQGQlqD7tJk42fWJc8/cv13mwYXt114ROEigDIQ8H5cwV8hBTj4jQIAAAQIECBAgQIAAAQIECBAgQOAwAQGQw4R8PrfAVOBjPL/H3KtakMAuge1ASPxAMGQXjz8JECBAgAABAgQIECBAgAABAgQIEDhUQADkUCILHCYQAx9xmdDr44fm9jhMy+fLCQwfDsNj/dTwWMvpWYsAAQIECBAgQIAAAQIECBAgQIBAHwUEQPpY6zWWedTr49lLNSYpKQIHCAwf1hvkAB4fESBAgAABAgQIECBAgAABAgQIECAwERAAmVB4sYiAwMciWpatX2D4YgiEfKn+dKVIgAABAgQIECBAgAABAgQIECBAgEBXBARAulKTLZbjrsdefygMdWVi8xbNbWo/AUGQ/VS8R4AAAQIECBAgQIAAAQIECBAgQIDASEAAxJ4wt8Ao8FGECc7jY3B29Ox/AusUKCdLj5Ok6w2yzmqwbQIECBAgQIAAAQIECBAgQIAAAQIJCgiAJFgpqWVpO/Ah6JFa3chPJTAKhISJ0r9rovTKxDMBAgQIECBAgAABAgQIECBAgACBfgsIgPS7/g8s/TjwEZYx3NWBUD5MSKAMhDwfM2Sy9ISqRVYIECBAgAABAgQIECBAgAABAgQIrEHgyBq2aZOJC8QJzk/+24v/yyjwMfhq4tmVPQJTAoNTYb+N++xHr73964sfvvf61akPvSRAgAABAgQIECBAgAABAgQIECBAoEcCeoD0qLIPK2oMfMRlTpx75n69Pg7T8nkOAlc2v3U65tOwWDnUljwSIECAAAECBAgQIECAAAECBAgQqFdAAKRez2xTi8GPEPj4YQh8nM22EDJOYIaAQMgMGG8TIECAAAECBAgQIECAAAECBAgQ6LCAAEiHK3feot312BvDeZe1HIG8BYYPmxsk7xqUewIECBAgQIAAAQIECBAgQIAAAQLzCgiAzCvV0eUEPzpasYp1gIAgyAE4PiJAgAABAgQIECBAgAABAgQIECDQGQEBkM5U5fwF2R7uKq5jyKv55SzZHYHhi6Esz+sN0p0aVRICBAgQIECAAAECBAgQIECAAAECuwUEQHaLdPzvux57/aFQxAcEPjpe0Yo3p4DeIHNCWYwAAQIECBAgQIAAAQIECBAgQIBAdgICINlV2XIZHgc+4sqCH8sRWquzAoIgna1aBSNAgAABAgQIECBAgAABAgQIEOi1gABID6p/FPwYXOhBURWRwJICw4fjiobEWpLPagQIECBAgAABAgQIECBAgAABAgQSFNhIME+yVKNAnO8jDHcl+FGjqaS6KBC/I4MLUz2lulhIZSJAgAABAgQIECBAgAABAgQIECDQKwE9QDpa3aPAR1GcOPfspY4WUbEINCQwfPHK5re/e+33Fy83tAHJEiBAgAABAgQIECBAgAABAgQIECDQgoAASAvIbW/CkFdti9teNwWGL4Yhsb7UzbIpFQECBAgQIECAAAECBAgQIECAAIHuCwiAdKyOBT86VqGKs2YBQZA1V4DNEyBAgAABAgQIECBAgAABAgQIEFhaQABkabr0VhT8SK9O5KgLAoIgXahFZSBAgAABAgQIECBAgAABAgQIEOifgABIR+pc8KMjFakYiQoIgiRaMbJFgAABAgQIECBAgAABAgQIECBAYKaAAMhMmjw+GAU+Yl4HF/LIsVwSyFVg+GLI+fNhgvSfmiA91zqUbwIECBAgQIAAAQIECBAgQIAAgT4JCIBkXNt6fWRcebKescDwxRAE+a4gSMZVKOsECBAgQIAAAQIECBAgQIAAAQK9EDjSi1J2sJCCHx2sVEXKRGBw6ubPfP2z197+9cUP33v9aiaZlk0CBAgQIECAAAECBAgQIECAAAECvRPQAyTDKhf8yLDSZLmDAuYF6WClKhIBAgQIECBAgAABAgQIECBAgECHBARAMqtMwY/MKkx2Oy/w2qN3Oo52vpYVkAABAgQIECBAgAABAgQIECBAIEeBjRwz3dc8C370teaVO2WB8L18IeX8yRsBAgQIECBAgAABAgQIECBAgACBvgq4czmTmhf8yKSiZLOnAobD6mnFKzYBAgQIECBAgAABAgQIECBAgEDCAnqAJFw5VdYEPyoJzwRSFRicjT1Bjn36vlOp5lC+CBAgQIAAAQIECBAgQIAAAQIECPRN4EjfCpxbeQU/cqsx+e2vwODUzZ/5+mevvf3rix++9/rV/jooOQECBAgQIECAAAECBAgQIECAAIE0BARA0qiHfXMh+LEvizcJJCwgCJJw5cgaAQIECBAgQIAAAQIECBAgQIBAzwQEQBKtcMGPRCtGtggcKiAIciiRBQgQIECAAAECBAgQIECAAAECBAi0IGAS9BaQF92E4MeiYpYnkKKAidFTrBV5IkCAAAECBAgQIECAAAECBAgQ6I+AAEhidS34kViFyA6BFQVee/ROx9kVDa1OgAABAgQIECBAgAABAgQIECBAYBmBjWVWsk4zAoIfzbhKlcA6BcL3+oV1bt+2CRAgQIAAAQIECBAgQIAAAQIECPRVwJ3JidS84EciFSEbBBoRMBxWI6wSJUCAAAECBAgQIECAAAECBAgQIHCAgB4gB+C09ZHgR1vStkNgXQKDs7EnyLFP33dqXTmwXQIECBAgQIAAAQIECBAgQIAAAQJ9EzjStwKnVl7Bj9RqRH4INCUwOHXzZ77+2Wtv//rih++9frWprUiXAAECBAgQIECAAAECBAgQIECAAIGRgADIGvcEwY814ts0gbUICIKshd1GCRAgQIAAAQIECBAgQIAAAQIEeikgALKmahf8WBO8zRJYu4AgyNqrQAYIECBAgAABAgQIECBAgAABAgR6ISAAsoZqFvxYA7pNEkhKQBAkqeqQGQIECBAgQIAAAQIECBAgQIAAgU4KDDpZqoQLJfiRcOXIGoE1CLz26J2Ow2twt0kCBAgQIECAAAECBAgQIECAAIHuC2x0v4jplFDwI526kBMCqQiE48ILqeRFPggQIECAAAECBAgQIECAAAECBAh0SUAApKXaFPxoCdpmCGQnMDgbgyDHPn3fqeyyLsMECBAgQIAAAQIECBAgQIAAAQIEEhYQAGmvch5ob1O2RIBAXgKDs3nlV24JECBAgAABAgQIECBAgAABAgQIpC9gEvQW6mjc++N7LWzKJggQyFTg5s98/bPX3v71xQ/fe/1qpkWQbQIECBAgQIAAAQIECBAgQIAAAQJJCQiANFwdhr5qGFjyBDojMDgVgiCXQxDkXUGQzlSqghAgQIAAAQIECBAgQIAAAQIECKxRQACkQXzBjwZxJU2gkwKDr+oJ0smKVSgCBAgQIECAAAECBAgQIECAAIE1CAzWsM1ebFLwoxfVrJAEGhIYvvjao5/8UkOJS5YAAQIECBAgQIAAAQIECBAgQIBALwQEQBqoZsGPBlAlSaB3AoIgvatyBSZAgAABAgQIECBAgAABAgQIEKhVYKPW1CRGgAABAgQIECBAgAABAgQIECBAgAABAgQIEEhAQA+Qmith1PujeKAoBmdrTlpyHRT4y8/dXHz5U8f2lOwXf7hWvveT3/5pz2fe6JOAXiB9qm1lJUCAAAECBAgQIECAAAECBAgQqFdAAKRGT8GPGjF7kNRT37itLOVX/uKmfUv78999UL4fgyECIfsS9eRNQZCeVLRiEiBAgAABAgQIECBAgAABAgQI1CxwpOb0ep3cLWf/17/R86PXu8BchY+9Pv7tfX9WxMDHn992dOY68bP4b2tYFDcd3ShevfKPM5f1QZcFBqduOfvw1Wtv//rdD997/WqXS6psBAgQIECAAAECBAgQIECAAAECBOoU+EidifU5rXHvjz4TKPscAjH48fj9t86x5PYiMVBS9RLRE2TbpV+vBhdCeX/arzIrLQECBAgQIECAAAECBAgQIECAAIHVBEyCvppfufaxT993KvT8CA2U5v2ogbPTSew338e8BY7rxgCKRz8FTpx75v5+llypCRAgQIAAAQIECBAgQIAAAQIECCwnIACynNtkrRj8OHHu2UuTN7wgMEMgzvlR9eSYsciBb8d1VwmgHJi4DzMQGFzQ0yyDapJFAgQIECBAgAABAgQIECBAgACBZAQEQFasCsGPFQGtvrCAXiALk3VoBUGQDlWmohAgQIAAAQIECBAgQIAAAQIECDQsIADSMLDkCUSBGLRYpfdHpVhHGlVangkQIECAAAECBAgQIECAAAECBAgQINBlAQGQJWs3Dn0VhqN5YcnVrdYzgTqHrqozrZ5VQ0eKqxdIRypSMQgQIECAAAECBAgQIECAAAECBBoWEABZAng078czPzTp+RJ4ViFAoA6BB8wHUgejNAgQIECAAAECBAgQIECAAAECBLosIACyRO2eOPfM/YIfS8BZhQCBmgQGZ0NCD9SUmGQIECBAgAABAgQIECBAgAABAgQIdFJAAGTBao29PxZcxeIECBBoREAvkEZYJUqAAAECBAgQIECAAAECBAgQINARAQGQBSty3PvjwoKrWZwAAQI1C8ReIAPHoppVJUeAAAECBAgQIECAAAECBAgQINAdAQGQxevSsDOLm1mDAIFGBIYv6pXWCKxECRAgQIAAAQIECBAgQIAAAQIEOiAgALJAJYbhZl4w98cCYBks+pefu7l46hu3FfHZg0B+AoOzJ849eym/fMsxAQIECBAgQIAAAQIECBAgQIAAgeYFPtL8JrqxBcGPbtTj7lI8fv+t5Vtf+Yubivj657/7oPjFH66V7/3kt3/avbi/CSQpcNdjbwyvbH7r9LXfX7ycZAZligABAgQIECBAgAABAgQIECBAgMAaBARA1oBuk+kIPPLTP5aBjypHMRAS/8XHlz91rHwWECkZ/EeAAAECBAgQIECAAAECBAgQIECAAIGsBI5klds1ZTb0/ngoDH31vTVt3mYbFHj1yj8WD//L4/tu4c9vO1rEf//q0zcVW8Oi+Nf//J+W/246ulH88xP/pIjrzvuI68a06nj83//wYfHv//N/qyMpaXRI4ObPfP2z197+9cUP33v9aoeKpSgECBAgQIAAAQIECBAgQIAAAQIElhYQAJmD7paz/+5XcyxmkUwF/sv7W2WQ46DsV8GQ3QGRKhhyWEBEAOQgXZ/VIzA4FYIgl6/+hwv/sZ70pEKAAAECBAgQIECAAAECBAgQIEAgbwFDYB1Sf6PeH4cs5OOsBeJcH3G4q2roq3kKUy1bPce5Q2IahsuaR88yTQoc+/R9p8wF0qSwtAkQIECAAAECBAgQIECAAAECBHIREAA5tKYGFw5dxALZC8TARRXMWKYw1brVs2DIMorWWV1gcOHEuWceuLL57e8KgqyuKQUCBAgQIECAAAECBAgQIECAAIG8BQZ5Z7/Z3Mc7qU+ce/ZSs1uReioCT33jtpWCIG2VI/Y2Of93/9DW5mwnS4Hhi689+skvZZl1mSYQBOLvb50QAoJ1akqLAAECBAgQILBXoO7zt7gF53B7nb1DgAABAosL6AEyw0zwYwZMh99etRdIh2kULT+B5/PLshwTGAkcOX7Hk9ffvXy+No+t4bXwm363C+jaRCVEgAABAgQIENgjcP3KpeeKjcHn93ywzBvh/C2s9pvw7wvLrG4dAgQIECAwLaAHyLTG+PVo3g9DX+1D0/m3cugFogdI53fDmgqoF0hNkJKpWeDIrXf8VTEcPjEz2WHxsXDxfGzm58t8MBz+/UGr3bj61smDPvcZAQIECBAgQKDvAkeOn3y5GBR3znQYDG6f+dkyH8QgyKB4b+aqw8HPbrz/5vdmfu4DAgQIECAwFtADxK5AYEpAL5ApDC8JECBQg0B5sTydztbwzIEBjiZuzTjkgnxPHjcGP7jxxzd/PJ1trwkQIECAAAECfREob1jZGn5/V3nPFIOab1LZtYEdf45uiJkdVBkOHwzncPdMr3P0xOlv6vU7LeI1AQIECESBJpoZspYd9f4oHgg0Z7MuiMwvLZB6LxA9QJau2h6uOHw4zAXytz0suCKvSWB0sVzct7354T21DYWwnWjzr2KPkXBX4fSG3GE4reE1AQIECBAg0CWBOATpzvJkeg63NfxlaMt5ZboszuGmNbwmQIBAPwX0ANm33gU/9mXpyZs59AL5y8/dXPzkt3/qSY0o5vIC5VB+AiDLA1pzDoEdF8zD4ddCwGPqTr1M77OIPUYGxY55SEI5tzU2iot6iGxzeEWAAAECBAjkJRDnPL1+5fIjk1xv7DzvyfZe2dEcJNvzkIRhtKpzOIGQSW17QYAAgd4JZNoy0Uw9jSY+f+aHen8045tTqqn3AomWsSdIDNYIhOS0Z60jr3qBrEO9y9ssL5jfvXzvVBk3i9FElcWBQ1tNrZDty6qccVLOMExWVQ7BkErCMwECBAgQIJCyQNlbN2ZwK/TYjUGP6tym7vnXUkKoylgMng5lvhizdvTjp35lqKyUKkleCBAg0KyAAMiUbxj+6gXBjymQHr+MPSwev//WLAQMiZVFNa01k689eqdj/VproBsbnwQ+4njQo7vrulGwekpxLiYjEFIPplQIECBAgACBegV6fx4XgyDTQZ44VFa4mUUgpN79TGoECBBIVUCj2FTNCIBMYXhZ5NALpKomvUEqCc/7CVzZ/NZpdzjtJ+O9eQTiBXNc7vo7l14KE1/eXt4pOH0BOU8iXV+murNwY/CdeCEdi+s71/VKVz4CBAgQIJC+wOQ87t3Ll9LPbYs5rAIiYd63o584/cW4ZeduLfrbFAECBFoW2Gh5ezZHIBuBOLxULo+v/MVNxZc/dayIPVc8COwWOHHu2UvVxc/uz/xN4CCB8d2Cl67Hi+YY/IgPwY+9ZNFk5LIZrXaMqb13ae8QIECAAAECBBoXiMNdleclgh97ravz2XB+Wxm5XtrL5B0CBAh0RUAAZFyTen90ZZfubzliECQO2yUI0t99QMkJ1CUQL5iP3HLyrbLXR12J9iqd4YPR78jxky/3qtgKS4AAAQIECKxdoDqPC712f7T2zGSUgetXLr1anr+F8+CMsi2rBAgQIDCHwEfmWMYiBHopECcXj70qYmAhp0c1d4nJ0XOqNXklkIbAkeN3PFkUw3uK4fDOSY+PNLKWVy5GdxXeXgyK26sgyI333/pCXoWQWwIECBAgQCA3gfJcbjj8WnkeZ8DzxaqvOn8bDp8IQSRzuy2mZ2kCBAgkLXAk6dy1lLnQ++OhMPn591ranM1kJHDT0Y3iX306rwBI5I15/u8/8U+Kf/+f/1tG2rLapMDNn/n6Z6+9/euLH773+tUmtyPtPAXixfLGseP/uhiEC+aNwd3hovnP8ixJgrkeDO4InndsfPTPvhKM/4eP3vW5V30PE6wnWSJAgAABAhkL7DiXq4Ytzbg8a816PA8eDu/d+OjxfxbPj4f/33/9P9aaHxsnQIAAgZUF3BMQCO967I3hypIS6KxATpOh764Ek6PvFun738OHX3v0k3/bdwXl3xYY9fgIf28U57ff9apRga3hL8NNF68E84s3/vjmjxvdlsQJECBAgACBzguU53PO5Zqp5zhZejF4+sb7b7phthlhqRIgQKAVgd73ABn3/vhqK9o2kqVArr1AIvaf33Y0DP1aFLEMr175xyz9ZbpWgf8r9AJ5193ntZpmmVic5HH44dbflIGP4fBfhB4KhsRsqyZjj5BoXhT/48ZNx98eXvuv/6mtTdsOAQIECBAg0C0BwY+G6zOeI4fzto1/evySc7aGrSVPgACBBgV6HwC55ey/+1WDvpLugEAMHMThpGIwIceHIEiOtdZUngdfDUNhXb76Hy78x6a2IN20BcrAx9bW/7T1/1w9N+n1IfjRfqVF82p4hRAECYGQz7iobr8abJEAAQIECOQqUJ3ThfnG/ibXMmST79G58r8J52t/cL6WTa3JKAECBHYI9PqOz3jSsEPDH50Q+MvP3VxOXv6LP1wrTAQ+qtLpidyZdGI3VwgCCwvE37zrVy49F+b4+HyY6Dx25184DSvULBDH6N4a/ijUyTGTbdZsKzkCBAgQINBhgetXLj8yuZmlw+VMrGib8Xzt6MdPlTfRXvv9xcuJ5U92CBAgQGCGQG97gMSGoBPnnr00w8XbmQrE4Mfj999a9taIE4H/l/e3ahn6KU4mnnMvkFideoJkulPXnu3BV285+/C/DL1A/vfak5Zg0gLDD2/8n6PgR8imXh/p1FVVF1vD/9nwCulUi5wQIECAAIFUBQx7tdaa+Tdb/+/Vh0Jv6o+aHH2t9WDjBAgQWEhgY6GlLUwgcYEvf+pY4jlcb/ZiT5AYIIqBIo9eCzzf69L3sPBHjp98eRL86GH5syhy6AUSe4OEOwv/Kov8yiQBAgQIECDQukAZ/CiGD7a+YRvcJTB8cFQXu972JwECBAgkKSAAkmS1yNQyArFRf3qop5hGnQGROKRWVx6CIF2pSeUgMFsg9nSMgQ/Bj9lGyX0SgyDD4ROjervjyeTyJ0MECBAgQIDA2gQmwY94vuCxXgF1sF5/WydAgMCCAr0cAms0/NUzPwxjgJgDZMEdJtXFq3k/dk9UHv+uaxis3CdD3113dQ4Rtjttf6cuUA6DddVk6KnX0/L52zHfx2Bwx/IpWbN1gTg5eqyz4fBfbBw7ftLwCq3XgA0SIECAAIHkBAQ/kquSkKHhf7fx0eP/zLlainUjTwQIENgp0MseICfOPXN/CH6c3Unhr5wFYk+P3b0/qvLU2QukSrMrz3qCdKUmlyrHA0utZaXkBXYEP5LPrQweLGB4hYN9fEqAAAECBLovUAY/NorzYThTPT9Squ5h8bEQBDEUVkp1Ii8ECBCYIdDLAMgMC29nKrDf0FfTRYmBkbrmvOjSMFiVkSBIJeGZQP4Ccf6I61cuPWe+j/zrsmzkKBs6woW1eUE6UKGKQIAAAQIEFhMYDWcahsSMwQ+P9ATieZpztfTqRY4IECCwj0DvAiDxJGIfB29lLBAb8A971NUL5Ce//VPx8999cNjmsvtcECS7Kqslw46HtTAmk0hZn1vD7wt+JFMl9WRkdLfnpiBIPZxSIUCAAAECWQkIfqRfXVPnaq6v0q8uOSRAoJ8CvQuAjIe/utDP6u5eqZ/6xm1zFWrW8FhzrbxroS72AolFFATZVdGd/3Nw9sS5Zy91vpg9KWC82Lr+zqWXBD86XeGCIJ2uXoUjQIAAAQI7Ba6/e/nene/4K3GBTXWWeA3JHgECvRXoXQCktzXdwYIfNvTV7iLXNQzW7nS79HfsKcOpSzV6WFmGLx62hM/zECiDH4PB7XnkVi5XEBAEWQHPqgQIECBAIBeBcc/PzVzyK59BYGt4jQMBAgQIpCkgAJJmvcjVHALzDH01nYxhsKY19n8de8oIguxv0813B2fveuyNYTfL1p9SHTl+8oNC8KM/Fb41/FE5GWp/SqykBAgQIECgVwLl73z4ve9VobtQ2DgU1nD4hGFLu1CZykCAQNcEehUAueux1x8qioHhrzqwF8879NV0UU2GPq0x+7UgyGwbnxBISSAOexWCHy+PJl9MKWfy0rjAYPg1QZDGlW2AAAECBAisR2CjuOj8bj30K2/VTUkrE0qAAAECTQj0KgASAB9oAlGa7QosOvRVu7nrxtaqIEg3SqMUBLonUM75ceXSc+b86F7dHlqieHdhvLgWBDmUygIECBAgQCA3gbL3QOhFkFu+5XdKYGv4fb1Apjy8JECAQAICfQuAPJ+AuSysKLDKUFarrDud7Z/89k/Fz3/3wfRbnXsdgyDL9LTpHEQPChR7x8UG9R4UtRNFFPzoRDWuXojyDsPhg3qCrE4pBQIECBAgkIxAaDw3tGkytbFcRjYGny+2ivuWW9laBAgQINCEQG8CIKPhr/QAaWInajPNVXt/GAZrsdqq02uxLVu6XQFDA7brvfzW4t1k1/X8WB6wk2uGIEjYLzpZNIUiQIAAAQK9Exi80rsid7LAw3ucn3WyYhWKAIFMBXoTAAn1E4a/GpzNtJ5kOwjE4MeiE5/vB1dnL5D90u/ae9E82nsQILBegbKXTrwrMN5V5kEgCsThsOK/otiMF9l6ctktCBAgQIBAvgKj3/HhPfmWQM5Lga3htfB8pojn7R4ECBAgkIRAnwIgSYDLxPICdQUuls/B3jW7PgxWVWJBkErCM4H1CVx/59JLgh/r889gy5vX3718bwb5lEUCBAgQIEBgmjoGygAAQABJREFUH4HOnevFQMBw+PeH/tvHIuu3tm9QKdycknVNyjwBAh0S+EiHyqIoHRZYdeiraZpqWKc4j8eqj1/84VoR0+vDowpA1eHWBy9lJFC7wLB4oxgUt9eergS7IRAbGTYG3SiLUhAgQIAAgT4KdOFcb9T7oaq939y4+tYXqj/2e44BgjC866uTz0Y9Wyd/Zv0i9Nouh64tigMNsi6jzBMgQCATgV4EQML8Hy8Y/iqTPXJGNusY+mo66diYryF/WuTw11Wgh9vhVjkuceLcs5eKYvjwa49+8m9zzH/X83zk+MmXQxnPdL2cyreCQGww2Br+KAyFVdz445s/XiElq7YoMGn4GRTvFcPiYyHIudxzyPPRE6fvvvb7i5dbzL5NNSxQ7h+x998q+8bufWpj8B3HiIYrrsfJHzl+x5PFYPi1Wfvs0U+c/qLjVMd3kHCMOfrxU7+KpZynruMy4Vh3d6VirrtKor/P5XGkGD649DnR7t+9ovjNjfcPDsT1Vzvfkpdz7AyHT8z6vZnr/WLw9I333/xevgpyvohAL24VvOuxN4aLoFg2LYGnvnFb7b0s4tBV5//uH2op6OX/7Y5a0sklkUd++kfBo1wqa+F8CoAsTNbwCuPG0ecMfdUwdJeSj0NNDAZ/rYEzvUodX9DvHdu9jnl94h23owv+N3aX3EX/bpH0/h4HufdmbFDcGb7P9fb8K4ejCT0K93mEINo352mw3GdVb/VAYOZ+Ol32w45nB+x/k2Q2Bj/o42/Y5GaXHHtAjHqhloGPVY8h8dw37gvXr1x+pNgozk/2i1xfbA1/6Xd4b+WVjdez50g5M57jbu+Ky74T6mH/VQevaADfXyaVdyfXw7szVMc50qjH2m92Jx32v17+Du1x6NgbPQmA6AGS635b18Tn+5W/rob8JgI0++U3pffqskupTPJSFFc2v3V61YsWjvULhAsEQfz6WbudYtnANPhZKhd02w3/g1dCT7MQAEjv+eiJU4/XffwbXbCFBpyqzOtqyNkqnqry0EQ5u/1lqrd0M78LhzUa15uN2amVDUTT38+iSOU4MjvTzX2y5ztcfZcTe26ijrYbJ6f2h7aOYT3dD0MA5IPaG32b+3rsTvlc3UGr8vu3PbfZ5u4NZvN32cDqLvM9v391NF7XsROM66c6T4rPbgaoA3b5NPbsKzGpts+TWvgdGv3OFvdN73spXiM1cY6x/N6x2po9CYDoAbLabrK+tZsMLtTVC6TJIM365A/ecl12B2/Fp+0LDF+8svnt79bdCNh+ObqzxfIEsK0Gh1TY4glnuOum2AonhBvFxZqe87+DcJH6Gd/NlMIdh+MGjDDEXtqPMFxHLQHg7YuZcXlT+/5OLuhC/sL3q+4Gq7RreT25G13IV9sOQ3rkdHf3OJha5b5LF8FVmQ56Lr/PRZFuw2s81oeeX2GOhZMHlWORz7aPYSFY3XaD00EZLQO53Q7IHbnl5Fu19/g6yLSOz+IxooVep104Hw6/t71oe6t2q+0A8vid6fOheOxK9bdwfA49aoie5N35UlWxDT3vOFeKwyhWvV9T2ldq/h3K5bjWpWNX5w/CYf6Ph8LB60JD31PJNijQZPAjZrvORvy+DYNVt1+Du5GkFxYwDNbCZA2sMLlomL5YaGA7SSQ5Ppms8tLEHeo7TqrLDSXWsFMVvs7ncSBp3Q3co305TG6a6oXu2HzVAMi4oTTcxBXGIq4u2uqsz7rSGl3YxzvpjoW8lg1XMel17yd1FS+VdMaBv3vHAdzzYX6ea5O8Jf5dmORz+kXVABGP1zEwHR5xjP+u3zCRfAAkVkQ41q8a7J4cv2J6KR/Dyu/R4OlqH4zZ7dKxK7sASEvBj1jP8ZFLY+Eot7v+D1Z1Bip3pZ7MnzuOJXF4qxhErX4/ksnlHBnZ/zf7XFyzS8ecOSQaXWTfc6WUz5GqfXl8LrTqeVAux7Swz3cmbtCDSdAFPxo9ajWUeOxVUU263dAmak0/BlOazm9TDsumG8sb68mk6MsKWo/AbIHrsct/V4Mf8YJ5WI0/v3fc3XCH8WyYJT/ZfdfyuFH+uUlyKd3lOsnUii9imYbDO0MqJkQ/jHL6QvewZXd9PnWxP7pLfJD4NcL0heUoUFPmO5SjLJkL+10VvMCfkwv5sE4Yuz72YDsf/o0e0+4LpJnMolX+R79LZY+6MFHxL8N+84NVGwCSKWPPMjK9v4aib/dySfkYNtoP4/436tUZgj9dOXaVvyXDjEY8bTn4Eb+e8VwuNBiGe1un7g6PH3isXaDcf0e52D6WbIzPh6rfj7XncoEM7J/nHedLMTW/fwuYTi1a/f5kd65U7RfjcyHnQVOVmsnLTgdA4hcrk3qQzV0CX/7UsV3vNPOnBvzVXB+//1YBkNUIrU2gPwLxYjk+4lAJV99ca6P8+K7lL1T45cSjcSziYfGx1HsqVHme9zmeC3X9Lu15LWYuV13QzFxg5wfV+WUZqIwNh6M7wnYulN9fZTliY2K8oI/Zt9/MV4mT/eHKuKdTdYfgfKvnu9QocPz50ABwLRjcHQtin0m/Orf31w5MMD3eB+MxOJQr2+NWrJPwe7IZzo/S34GqHLYw7FW1qennURDk5D1h6Lfbp9/P4XWs5y4dIyfHktE8LV05F5pnVxoFecJxJ/z+/SY4fDOu1KW6nQdhmWUm+8w7l14qe0tXN4ksk1ga65wJvz8/uv7OpfdC2b4Ys2Q/SKNiZuUi/11uVsnsfAfIpP1RG70/KoG6Ai2/+MP2yAZV2n15jkOVeRAgUJ/AeLim7Tuo6kt6PSnFxsDw7+gnTn8xdv9P8Q7zOHzIaGiCMLTGOL/rwap5qyGgEy7OXq0uOGpOvTvJxTpf4BHuWHskNFbFeU1G39MFAygLbKrdRUfl2Ixli2Vsd+N5bi3e9Vp6xf2h2g+q5zyLtHiuQ3krg6m7gBdPxxqtCITfhOfK41eXepnaB1vZd9LZyOCVdPIyZ05Cj8v4vevS+Vhnz4XmrNLyNz8EYcvfv9ig73GgQNz3q3OF8oazA5fO5MN4vhf/jb/fXfuOZ1ILC2Wz0wGQhSQsnIRADH7UFZSYp0B9G7ZqHpNFl6mGwlp0PcunKjC4MJo7KdX8dTtfo+BHmCS3K4/Q6+PoidN3x3853BET5x+JeQ3dVJ7uRBWMT8wFQQ6pzeg056Nz39GZ5R4+GMejL3tHzVymvx/Ehv5g80G886+/CvuUPMwfUe43wWefT721ZoHy+zzqNbHmnDS4+fCdFIhr0HeU9Ll13swSz9XC/EpPNV5KG9hXIB5Hyvlqig5dr+xb0gXeDA3g43OmD7oU5FpA4MBFy+BH7CVbPRY4765WyeU5XnPF80O/Q2nWWGcDIPFLFhrxXkiTXa5mCcTgR9tBiRh0WfUR58GI84D09dFm0Kqvxi2X+4GWt2dz0wJdOSmMwY/Q6yMGPnIIfsQqqPJaXlwXRTnZ4XTVZPs67FO51MFajOfsATIJfnTlO3oQdixjnCMkNJaWjaYHLduzz8qL2jhRdB/2g0XrNu4z8V9shI6NZMfveHLRJCxfr0C8Jh7VxcmX4/e53tQTTS0G4ux/iVbO6tlyPrO64TIpTI4jRXFmfH4w980jy2wvu3VG50zHwnBILwmCjGpvfLPIy9GkN+dM1blh/B1yM0hyX+POBkBG0oOzyYnL0EyBNoe+mpkJHywloBfIUmwpr/R8ypnrat7KhqI4sWPujzApaSjCuSr4kWNx4sX1eB6EGATpRCAkXri6IJuxN1YXKzM+3m5IC3c7HrLsjCTyfnscBInHqD7vQ7H85XE6Bj9iQ0d89HF/mGdvji5lY3voSSQIMo9YI8vE72sc8qqsi74EP+K+N2qI/HycLNv+18iutfZE9QJppwriMWQS+IjHkNE/gY+D+MPxJx53S7ceN4BP3SwSjsXjc6aD3Lr0WfU7JAiSXK12PACSnLcMzRBoe+ir6WzovTCtsfxrjsvbJbimHiBrqZRhmNQx8xPEMCRBGELqm3FohNzv0Iv5j+UYD/OQfxCkL41fy3x3D+gBUjaelRf8xfneNnZHn7FBvKjvYxBktB/EfSD8y/04vcx3ZNl1ygDRKAiiIXpZxOXW2xH8WC6J/NeK31VBkPzrcZ8SlOeYG8XFfT7yVk0Cu44hZ2pKth/JjM65zxQ9bAAf9foIvT+nbxbpR63vLWX8DerhPrAXIp13BEDSqYte5yQ2nrc99FXd4H2eCD1a6gVS9x611vT0AGmZv7xLZlDc2fJm691c6PkR78jLPfCxH0oZBInjTYdhvfb7PJf34oSVfWy8PrR+ykbanUtFp0mj986P+vfXtE+4qO9LEKTcB+JcH/EOzi5NGN32Hhz3n+gX/sXvlGNQ8xUQjSc9P5rfXNpbKAOWIQjX4zux064guUtRIH5fdhxDps8DUsxwinmKZlMN4H04Bo3LuFn+5g+Lj6VYLa3nKe4D47mp+rAPtO674AY7GQCJJ30nzj1z/4IWFl+TwLqHvqoz8NLneUDi7hMDWXXMqbKmXdFmtwUe0ECxjdHSq82s7yoOwY8b77/1hS4GP6r6v/H+m98rhoOfZR0ECQ2Q19+9fG9VJs9jgV09QEaNh5cf0ei9zx4y7g3S9SDIZB8ois2gEP95rCpQfs+GD8ZAbGwEcJ6xKuj+64/23fGwV/sv0r93R423mxqfOlb1W8V9HSvR2osTjx/l92Rr+P2y5+fac9SBDJRB2NG5RJePQeOybZ8vCZpt77zj36DwxqZzn22WdbzqZABkFPwYXFgHqG0uLvD4/bcuvlLNa2i0rwe0zmBSPTmSynICg7PhOPrD5da11qIC5YlQzj0LQt5j8GPRcue4fBkEGQz+OusgSGgwcPK9a++bukiLNrGBVvBjl1H1Z2XV4Z4g9oGqsmt+jvtOuf+EuXRCI0DXg2g1682V3GjfFfw4AEsQ5ACc7D6KQ2DlfP6cGHh5/Hj38qWQrXAHf5jvw6MJgU4eg/YEP5qQkyaBGgQ6GQCpwUUSLQk89Y3bWtpS85v5yW//1PxGMthC7AXiQYDAfAKTi43R3UHzrZTKUvFu3hj8uPrWyVSy1EY+yuGwYhBkV6+BNrZdzzZGd2DXk1ZHUpmqy9GQD2G4Ho/DBWIQ5J1LLx2+YF5LCIA1XF+7gmgNb61XyZffRw2Xh9V5JxsgDyt0Fz/fcT4Wf8dz+JdoRUyuRxLNX8ey1aljkODHYntn6Il/qcs9gRbTaH9pAZD2zW1xLLDuoa+mK0Kj/bTGaq/NBbKan7UJZCTwm74FP6q6KS+6Nwbfqf7O6rlqfMwq0w1nNpjE4duOHD/5ctiSiT4X4Q7B2yO3nHxrkVVSXnY0UXfZQyHlbHYnb6Gxfvy9606Z1lSS8nuY480U6/Aaj8e+jk3bZr0C8Xws9EK+6eiJ03fn8JziULHjnmOv1lszUjtQoCPHoLIhP5TlwLL6cK9AMIvfu9Db/OLeD73TpMCgycTXlfZdj73+UFEYAmtd/vNuN/b+SGXIpDh3x/m/+4d5sz5zuZTKNDOTLXxQl2cLWbWJmQLDF1979JNfmvmxD2oTCCePw9oSayuhcsLz099M8UKuLYK4nSzveip7OwyeLofzagFrcmGdeOAlNKIMyoZYd08vt1dkfkyYaoQ/MxqmaTkGay0pMJ5Hasm1G1stm2N88DNkzYK7QRw6Kczr1dZv4UG5y+ru+3gOMSjeC/PW/XV5M8hBBfNZ8gLlvhd7cgqetl9X8bsUbqbK9XtU/j4Oh0/Yd5bcdarh+zL47sVrpCVLmdxqeoAkVyX9yFBXAwW/+MO1flSgUhIgsLJAvOiYanRbOb3WEsi8obNOp/FFy7mshsMqAxHDe8YNe3VyZJ1W+V0cFHdmXYh1Zj4Oh3Xl0nPxuLbObCy67clxOAa+Rv+M47koYh3LB/ssfw/rKHsdacR912MxgdjoNBh+bdTra7FVe710PIfIoMGu13U0Z+HjeWA57Kf6nFOs5sXidykEEHI8Hy+Pm4Ifq+0Q5W9Q+B3yaFWgkwGQK5vf/mmrija2kEBKQ19VGTdsUyVRz3P07NL8LvWoSIXAPgK5NVpsFU+FYQZ63/NjuibLIEjivRum81u+jvvd1vD7e97v9xtnNOqsvAOcyTEI4s75leu9ngTKIMgdT+YWRKun8FJZi0DZ8Du8Zy3bzn2j4Rwix4bb3Nnryn9Zd/E8MLfrkLoAUklnFHzKak6Q0fc+DBUqcJbKXiQfCwh0LgAST5pPnHvmhwsYWLRlAfNttAxucwSWFBgNJ7jkylY7UCD+VpUT7R64VIIfhrFK+z7s1b61EgJD+76f+JsaL6YqKLcg1lTWk3kZDUNjSi5BkGyPw8lUeAMZ2SjOx99GQZAGbCW5v0Do+ee3cH+aA98d30jB7kClJD8s6yzevS/4kVL95BMEiXN+OGdOad+RlwUEOhcACcGP+8P8H2cXMLBoiwIp9v5osfi92pReNblXdzyOmkupqVq8/u7le8PEZ+ebSr+RdOMY4x77CpRjiMcgSDWe675LJfZmvPCNF8AeBOoWyCAIMgl+5HYcrruuUkyvDILkN5xaipTyNIdAhndgz1GqdhYZn0cIWLbDXcdWJsEPd+/XwVl3GskHQcr9J84B5EEgU4HOBUAyrYdeZDsGP/T+6EVVK2RnBIYvdqYoCrKaQGjYj0Nf5TpR32qFn2/tMggyLN6Yb+lElsotv4mwycYcAuMgyBxLtr6I4Efr5ItvsNx/Lj+y+IrWILC0wKaG/CXsQkN66PX3Krsl7FpepayjePe+4EfL8gttLtkgyPg7vlkMi48tVCILE0hIQAAkocroelZi8CP2CvDoj4CAV3/qWkk7LLA1vHb0E6e/aOireep48EpWE6LPUyTLEOiYQDn8oJ4fHatVxSGQuUA418q2BGE4nNCz+ZIgSLo1GOsm1pGhi9Kto6mcJRcEmew/MZOGv5qqKi9zExAAya3GMs1vX4a++slv/1T8/HcfZFpLsk2AQBsCZffheAdWLg8nunPXVNkLpBg8PfcKFiTQbYEzR46ffDmlIo7yEybv9EhfIASpUtt/0keTw1UE1tWTId5gEnrZ3p3VMJr7QK/Lb5+seGuXgJuYdoGk/me4TiyvFxPIZ8xH/G4nkBVZILCygADIyoQSOEygT0NfxbJ6bAvo8bNt4RWBicBWcV82d8/Eoa8+fuq0C6dJ7XXtRXIN1F0D7nV5YvA0DGWUXCO2oG4eu+XojnjHqDxqqxu5DMeG6+9cemkdDY9dOc8q/ULgex2G3dgJ6y9FvHs/ud/h+ovZrRRTO09JLT/dqm2laVFAAKRF7L5uqk9DX8UeIB47BQSFdnr4i0CY/PxiTgpduShvy/zoiVOPF3FC9BweowuaMzlkVR4zFogT5SbwOHL8jieLQXFnAlmRhXkE4vEp/lNn82hZpi4B8yMsL1l+Xwe3x8B36M3yRGx0FwhZnrOONcd37z9X1kkdCUqjPYH4HQq9L9rb4N4tldvfGn5/7yfeIZCngABInvWWTa77MvRVVSEa+ysJzwQIdELARHcLV2MZMMopyDUo3lu4kFYgsIhAuJM/Bh/WOT58GfyI835o3Fyk5pJZtqy/ZHIjI50WiD2PQoPfWhoeu3R8iuePMRASh/IJx//qX6f3nVQLl8hNCKnyJJuv+B1aYxBkEvyw/yS7i8jY4gKdCoDc9djrDwWCBxZnsEZTAibBbko2n3TtA/nU1d6cDs6Oj6t7P/LOUgKTk8ml1m55pTD8VWE+i+XRt4a/XH7lFtcMF1hraehpsYg2tWaB8k7+EHxY58Ok5+vUX23bsVG4nA9kvUG01Qph7WwE4vGqKM6Enpz3tZ7n2Hu0PPdqfcv1b3DkOJowOR5/x//KQEi4q32dAfH6C5tmiqXxOvbjNDnyy1XVo2pdPTBGQzYn0YM3v8qT41QFOhUACQ01F8K/s6li9y1fT33jtsIcEH2rdeXtnkA8rnrUJpDLyWS8A3JYvDGa1Lu20vcmoRt/fPPHYULTb2ZR4FEjxabGiCxqK+tMXn/38r3r2M/GgedrWeP1PfPxN0kQq+97QXvlj7+La+jJWZ5zhXOv9gra8pa2v8eb169cfiQem+O/dfwutFzy1jcXTcPE1WHoqzXffNB6ybu5wbZvVBp9J4f3dFNTqfos0LEASJ+rMq2y923oq2l9QZ9pDa8JEMhSoLpzL8vMp5Hp2NibRk7kgkAyApttfy/GjQab5VwSyTDIyMIC49+ktvefhfNphe4IhBtWNMzXXJ3T55ajhvnNsIUQDLn0arSu/tW81V4mFwNM4yHIBP9z3wPGc+q0WYxR8CyN+dvaLLdtdV/gI90vohKuQyDHYY9MYL6OPcU2CRBIUiDepeexukB5t2M5nMbqaUmBAIGFBCbBj4XWymDhRY/P042OGRTvkCxuhnotYi+7Q5bzMYHVBEIDfWhEjml8b7WElli7b+cO4RgVgpuXKqnwHT/nO15prPjcpeP/Ir99XSr3iruA1QkQ2BbQA2TbwquaBHLs/fHz331QU+klQ4AAgS4IDJ6+8f5bX+hCSdZVhvEwWHeva/u2SyBJgTghbhjyJMm85ZKpjcF3wvH5pjDM3t3x+aDX4Q7g7+RSLPkkQKAoxudev+m1RTlx+skPjhyP/+54stcWSxQ+uL1cFMMHl1g13VXC3DgH/dbt/j0scpmHb17xOF/fLSffmnfxVZYr95/Y62SRgNMqG7QugRYF9ABpEbsPm4rBj8fvv7UPRVVGAgQIECBAgACBRQRauiuzDLIMh08Ug8EiuUtv2dDoc/QTp7+4O2MhwFpc+/3F8vb0+Nms1zEQG4aV+VW1/vV3Lr0UTG6v/s7yOdSrXiBZ1pxME5hPYOfvxPnQIDuai2BQ3Hnj6lsn50uk50vtNMwLo2x4Hzx99MSpx6czHup+5m/d7t/A8Lu3Yx6+8fCJcci1PB+xPreGH2sl8+F7Vm4n532oFSgbyVFAACTHWks4zzkOfRU5f/GHekZ7ybX8Ce9SskagMwLlXWyD4deKIocGORPfdWbHm7Mg0xePc65iscUFzs1YJd+L8hkFOvDtreH3W2nAzrmhP969ujH4QQh+/GrV7+b0+qFR6IuTeTTCHAdZTpCbc70e+MVY+4ezjk/zZqx7x7FwzhbO3UKvjDdbHQYr3M3+zdEcDiawLne+eDf6+DHq3TD+IxwjDZVVyYyex9caowbsnR/l8te58NtXDnMYvndL53n6d2+cyOV43lE+Qg+jsI1jSye+rhVDnuP+H48P+5SvllyV+88wBFpyuFStpcTjREbDDu7sMRvOVcN+Mjn21Lk5aa1PQABkffad23KOQ191rhISLFBdwaUEiyZLBBYUCEGFHBputoqnwgnfxQULZ/HZAufCXVvJX2zFi554t11TF1WzeTr4ybjxenfJZjXUTC7Kp1fo8oVXObRC8UoobiPzOATPvwrfuXjhOi2ax+vy+FtcDA0cZeAj9vSo8zH+fpc9R2LPkHKOg9FkxHVupvm02gqiNV+S9W1h13Fq1vFp3gxOjmOjnld59zKqCh3P2Ybt3xASv6cx8OKxr8CZybuxN9jxO+6r/m47UFVtN63nMPTVILPG/anG51WPQwfVRZX25FiV23nWyKmxBvlwTnAq3CBxPo8b9Q6q6RmfjXsWhRs/9l7jjoNu02uO95MfTL83ft29YP8+hezqWwIgXa3ZNZQr16Gv4vwfJkBfww5jkwQIpCkQTgyri4Q0M5hPrqrGxnDH1o+Sz3Wc8PXdy/GiYDKsTvJ5TimDseF6/AiN1wsFkvb7vo0bpx+p0szyTv1J5vd7MbwnBir2K/t+Sy/0XtmzIbO79sb7TxWEDC4LFXmZhcfHp+9NGlpzCoQ0HERbxjObdcqx8QevxBsd6vz+VWmVjUbxO1iEwIG7Z5ffLWIj3RbDPYDTd+7HIYHicWvUMHws7Htlw+bRj59auefcnu1m8Eb8TQ0Bu/dCVvMJQIZhHsNx4q+r40cbzNW2RseqYZHNcWq878feYeEccaHzzHlcR4HXk9eCR369Yw4qYNzHhoOfxcDOIkHSaj/ZnfR00NXv3G6d9P8WAEm/jrLI4VPfuC2LfO6Xybp6KMQeMB57BQSX9pp4h0DSAmXDRTN3Zidd7r5nbtSA0HeFxcpf3k1WlJPVhsk5J0OkrDJsQ5WBqnG6+nvUSF3eiXymIxenZ8peGg31AqncsngOwY/qoryOfWfRMlfbHu9jD+azfw3viXesjr8rixa7n8uH4EeTw6dE1HGj0Y/Lxtit0LgYH5kHQmJZZjWGjQpY//9xe2UDbVE0dsd3/bluOcWqobZ6LoryzuzQQPxUsOtVMGR89/5mVvNexYbpQbvBj+k9NH7HRjebXHoum2PU6Fy9kRuWdhyzp6FyfV0G+0Pm41B5V9+srcdxdc4UWXaYZf47l2s1L5rvjUVXsDyB3QK5D31VZwP9V/7ipt08/iZAgACBHgvEi9Isir/dgJBFdteeyTL4MXg6BD6+EP81nZ94wTXazuDp8m7XpjfYdPoN7W/ZfN+ib9yHpoIfTZMflv7ooj6j/Ss0Nly/EhquPA4XKO+AHf59PIa0FTCKjYtxezHgEu5K//vDM5noErFRKw5jua5HznbrMivCMFCxzsK/eIyIvwvVv7VlyYZ3Cqw5+FFlJh4PszpGNXvutJnPDRBVDe7zPP69KwMf8Rw9/Bbts1Qtb3Xmd64WjTwSEQDJo56SzWUMfuQ88Xcc/qquR84OdRnsTqdO391p+5sAgYYE9hsbtaFN9SHZthqbVrYc9WZYOZnOJ1A2WoeG6yIGP9qdGDfa7mikzrnOGsp72SCezVBO69mHDvqO7ti/DlrQZ/kIhLtgb1x962T8t45Mx9/Acts5N+QPijisUOuP2Lh29BOnv1gGS1vfesYbjI3E2/8+H4b3vFT9yypInnEVHJj1+Pu/xp4fu/NWBkF8z3az5Pl32LfiMbP8zWsw8LEbZ/I7F/fths5vd2/T38sJCIAs52atsUBs9M+510Ndw1/ZIfYX4Lu/i3cJJC0wGgIr6SzKXAMCDd1V1kBO15vkxuA74a7mm9YR/KgKHrcd8xAaeL5TvZfd82h/OxPmx3k5u7zXkeGEen7sLs4kCLL7A3/nJxCDHy30UJsHpmzIzzkIMk8hG1imbJw9cfruBpLuZZIhSP5q+N35oBy6piMCMagTy5VNceJ5VIuN0/O4TL5nuTReh95NXdqH56mjQ5eJwY9wrIx1eeiyDS0Qt1+en1fDbzW0HckuLyAAsrxd79fMfeirOic/z92iqZ25zuHFmsqjdAkQmBLI5cR/Kste1iSg7ueBPJfSRfs4L+fmyXiyywyKO5PNWxMZi9+zEPyIk503kXxdaY7zl/6+Ffaf3gbRDqvscj8Lw08l8igbGONd1oIgC9dIaffxU6cXXtEKewWqniHD4RPx2HHklpNvhfmPnty7YGbv5HATy+g8M6nzqOlangRBcjhG1VjfMZBy/Z1LL01bZPc61Nm6gx/RrAq+lMOqCYIkuRsJgCRZLXlkKvchn+rsnZC7RRN7nOGvmlCVJoGGBcoLw+Jiw1vpVfLlcAs1Xqg0hpdDHhsr/FwJJ3nRnnUQJO5zw+KNufTnWKhsxEo9oDI+xlYXyXMUay2LpJ6/CcpgcHuRep1PMtvii3GQLbV6jPkZD+n0yxY1OrGpcV2eM7xKTdUZjx1xfpfyuThfBkP62iOxJtIDk4lBhQR7fuzOc2+PUfF7kOMj/NaFbJ+Lvysp/d6V+1Gc/0oQJLm9SgAkuSrJI0O593ios/dHHjXWfi7rDDC1n3tbJNBjAUNg1Vr5k0aL1O8o0wPkoHpPMvhRZXgSBMmxDss7+Gu6+3Yw/FrZmFXBpPgcG6Y/fupXKWZtd57KfI4aF3Z/lM7fOe7zbeiFubxSagyaLrKGoWmNxV6Xx/o49GHq5xOLFSuVpc/EgEgMpMd/ucwVMhr+6vIjqSDOzMew+Nj4XGXmIql8kOqxc4/P1vD7hsEKc+OF4dRSrLPt37oySLOn+ryxHgEBkPW4Z73VGPx4/P5bsy5DnY3zuQeDmqhIAaYmVKVJoAWBeKeKSdBrhy4v+mq80732DMYE9QDZyxobmUIDcA4X7WUec2wYG999uxe/m+/EoaVSvFDfT3t08Z72UF3VcUsj0FQNZnDHafkd2Bj8YCrXab8Mjbep7GPlsT5MIC0IUvMuU50DbRTnw3nw+TCnxnOxzlOp91mlDZO73xvzO+vzJN4vA3aDp5PIy7yZiMen1I+lsQdTn29ay+CadXIelfq+NO/3ogPLCYB0oBLbLkLuwz3V3Tifu0cT+0+dAaYm8idNAgT2EYh30oYT/hwae/fJffpvpT5Mizup9+5DIWi1zsnO92bo4HfK7+5w8LODl0rw0xr2vdQbqUr1XC+AU8/3aOiOzVzu2G76GxjHHs/mdzz1fauqrFHjeDL7mCBIVTENPsfG5aLYDI3g5V32WfzGNMixUtKZnUvFso6OoYNXVip3BiuXv5s5BlHCb0cuv3UxCBImRv9C8gG1DPbXOrIoAFKHYo/S6EJvhzob57vgUffua+6PukWlR6Algerut5Y217vN6AGSV5WXjfKZXvzWEFDIqbLGDd+bqQ9/FS+AyzvfM8KdXLinnuee7fMzqyOjoZHKBsaceoHMRF/PB4IgLblXgZAQDBFkXcI853OpJYqb2yqTHkQ5/YaG37kY/MjtfKoMguS2g3QwvwIgHazUpooUG/tz7+1Qd++Ppqz/f/buJtSyq14U/VpVp3gRDkRRtCBlYlXjKYGH154GDCS34e2Y8BpXOKVCMJ3YOJzqmG7wNWPHkIbpHAl4LMHbSuzc17gWRNC0Xq4deec2qmKswyuDYgIXTiC3ar3xn3PNvVft2h/rY841xxjzt6Bqr4/5McZvjDXXnOM/xxilb/e//Pf/WXoWpJ8AAQL9CugB0q/nkFtrL9hfL6n3R8fRpjkNNVHSxWxK/C4NS81FcAH53SWPXfmO8bfUdI9hNfY+c5sIdi2PAr67a+VjhIUiCLKcVP6jEXY/uV2mxuKbjoebFvu8yHOpg1xO5fhU0E1wRf7OpQrVHDumUp8OvkD5PREAya9Msk1RBD++8aVPZJu+dRLWZ++P2F/pc6GsY7bJMhFg6tt4k/1blgABAtkK6AGSbdE8mLCyL9ibIEjMB1LKI114p/HW/7Btw9K265XCI50EahVY9gIp51iVYUFEADjdDf14hkmrMknxW3X+4Uv/nsOQWE0a7i1+WiV0Bpkq41xq8dz5hz//k625Shz+auvMjrviskftJ8zfNG45CICM61/M3msY6qnv3h9h4nG/QAQ/9P6438QrAgQINAJ6gJRREdydNU457XD3YfbDIKQ6deGzl69kn85xSr63vU7at+A6lr4bb/dWCSa6oaj7cYyJfxrXBq4E3W9VCjyMHgSJxusuPQNne6vNN+dTiy9vta6V1hNoyn8H43Ozt9bbUQZLFfw7d5/eYvbp+157sVcBAZC9cpe7s9KHvgr5vnsm6P1xf33uO8B0/9a9IkCAQOECeoAUUoDz1y9cvPxyIYk9MZlNo+K92WsnLuCD/QnMZ3+ddOP8PqRTI1C6K/u3U+4NpI7to6Llu48o/6YOzOc/EAQZuJyi0Tn+LRY/GjUIkn3jdZxPXfn2wKVh81MRSN+5Kn7nood2QfN11Va9BEBqK9EB8vPatz5T/NBXL775t157Juj98WBF6zvA9OAevEOAAIGCBfQAyb/w4m7F1KBQwwVW5KGGQM5ZlSYavHca/uGsHfh8tvw+XM3+gr2drHh6JdbcZV1utptJeMtNfnYpP5gcfTa7muaC+l12CawpQfP5I8l4vJ4guQ9fVMn5VNZVdofj/3IItX/MOn9d4tqAwdXuZcl/m2N07jfFlQx8Rtr/7ozPfTxxgRqGvooi7HtYphp6xPRZtfX+6FPTtgiMKJAuplKD4ts1NACPqHj8ruNkdz575PgPM3g37mac+qNGg+gFcm72QtVF2+Rvnm8W03AHo94l3JdMDNuQMXNf2SxuO4Uft6K32sd3btV/nNpjxWoa2NL+4nwu2b7Y7Lr234E9+t63q/b7dz0d42ed+32fD/mi7QGS7+/7vcU/hkvRj5SH1Nsn3yxE/bs3+/1WCWyHUPvaVuuOsNLev19D5vHc/NV0U8mjswiieuxVQABkr9zl7ayGhv7o/dHno5agUJ8mL/zyL31uzrYIEBhLIF0gp4vl2Pv3x0qC/Y4k0PR+yPgibx8scbdszhe6GxosA5nfTw0Q+TaQbJinIhdfNpAVmfbVRFf03VjNVvHPmzuA56+Xmo+D49TDl57Lej6DAoE720h6GiKum4vhK5wHKcxxgiCDZKWnjba98oppYD8h1x+d8H5Gb+8wB0hGuTgxKdH7YzH/1YmfF/hBBHNS7+Un000lzs/3XH6GwNozeEm7q6Ghv++eCWFSQ1Coz3rYd4Cpz7TZFgECBHIQaMalz30IrMLvIu6jnGOs6qruMEsoTd3rA8c2CBDIVeCdux/+qeibFhynhq9adz+8/UT8m81SsCyC/cagHwI9giD/MMSGj26z+c7kPgTW0USX+LqQc+Oqj6Ep+FH6b1yJVb/WNAuA1FqyPeQrho2KAELJjyHmpfjGlz5RMkmvae87wNRr4myMAIHtBLKfVHG7bI25Vhrj/Gb23Zx3GEd4TFv7JkCAAAECBNYTiIbEJhASd1TH7373b73VLXWaQHsetZcgSDO0mWHNTiuNKX32lY//fPM3U8pwNXl17bX3ojQE1t7Jy9qhoY3uLy+9P+73UD/u9/CKQBUC7R1lv6giLxlkIu7K+vjOzTS5duZzbOSevj2U5XIy3mYMuD3szi6OCKTvyR/S3bPfq60XzpFsekmAAIHRBZZ3VDc9h5rzlLhRw2M3ge48qp0Yff9zguyWemuXKhD17t7ivVKTf3a66xziK47BaRisyL5hsM6uBL0toQdIb5Q2VLvAa9/6zEzvj8NSNvTVoYVnBKoRcCdK70VZzITyUy77Nu9Xa2x4j/qXJhm+0tzl23vttkECBAgQKF2g+51ofisMjbV7cbYN0j/d13BYuyfYFooXyH2Y3Z2A59tN8r7TPq1cq4AASK0lK18EBhQw9NWAuDZNYEyBuGgzBNaYJTDevrs7F8dLwXh7TnmvMfjRgTZBuPnsr93rbP9OuQ5mWygSRoDAFATid6IJhHzuytdTfq82/+7NXptC3gfJY/yeLRY/Snd4/2SQ7dsogVWBxUwPkFUPzwmcIGAIrBNgvE1gVUDvj0ONCH4Y+urQwzMC1QkYAqu6Il0rQ9EL4tx8rUVrXCiGAGkCBTVmrpQ8TbwOllJM0kmAQL0Cy9/BZijI9Lv4dhoa8q2V3F5fee7pWQKL2adnszqH7zkr6z7fs0CNPUDa3tnvpGuTV/esaXcVCwiAVFy4staPwH/+D39v6KslZQQ/hphYvp+SshUCBHoR0AOkF8biNpLuVkzDX7ydekIUl3QJXkMgGmJyj2/pAbJGQVqEAAEC+xFYDYbEHlNvhicP9jxffHM2nz9y8NqTBwXiN+3eYhZDYdXcy/TBjHtn7wI19gBpzwlf9d3Ze22qeoeGwKq6eGWuDwETnx8qRvDjv/z3/3n4hmcECNQnkHqAxN3w9WVsnByVNAb0chLwcaDG3Gt7l9mYKRh+3yUMgTWFchi+pO2BAAECgwjEpL3dvxT8+EFq3P/dwb9B9ljBRs/NvxZDYVWQE1nIWaDGHiDh3Y5KkLO8tBUmIABSWIFJ7n4F9P449I5JzwU/Dj08I7C5QJrErYQGvnOzFz6+c/Pnm+fPGkcFloGk66n79kNHP8vudZr4NHqAZJeufSSohPLZ1aEZimPXjQy8/hTKYWBCmydAgMA+BOKu7Lsf3n6i+3cQCDkMiny0j3SUsg83FpVSUoWms8YeIIUWhWTnLWAIrLzLR+pGFnj5mU+NnII8dm/S8zzKQSrKFoi75tLwAZGJF/LPSQrWeExK4EKa+NQcGBUXedsDJO/hSiJAPOF5aCqufbJGgEDlAhEIWc1iM/n3vcVzB+9NNcDd/q49km4s+kOy+MSBhycE+hSosQdIc9Ng7mO39lmItrUPAT1A9qFsH0UKRO8Pj9nMpOdqAQECBAgQKFygwh4gMbzcslGp8MKRfAIECNQl0A6VdfsTKTDyiQsXrzxeV+42yE0X+ClhGMoNsmXRzARq7AHSfXcyo5acsgX0ACm7/KR+IIEIfuj90eK+8Mu/DKRczmajPqzOBcOknLKTUgIECBBIArX2AHGBrHoTIEAga4HoXZqGgLrSJbIZZjXmxpjSI92EcP6Tl27rbTulQt9jXvUA2SO2XZUsIABSculJ+2ACq43dg+2kgA1f/r/+VEAqh0ni0aDHN7502Gs5PjMfyjDutpqJwHzxzRiuK+7gyyRFxSUjxnteXuQXl3YJrlAgeoDkPpLAhsGMmLPm4/dvXU2ldb3CEpMlAgQIVCOwOsRmOj/6djp2f7XJXExynOaeqyajJ2Wk/X17ZNXhpEW9T2BjgVp7gNzbWMIKBE4VqCwAsriWcvtsus3tqVNz7UMCpwhE4/ZqY/cpi1b7UQx79d/+x7Tmrotyj0cX/DqtDsQy0wmANMfVauv6/jO2+HLcip39Yz5/ZLaItHpsK9Bc3E/tDsdtsaw3vECFPUCWdxXP0ndteD97IECAAIFeBJZBgObAnYIhEch+a2XDVQe0Y26UCxcvvywQslLinu4uoAfI7oa2MAmBqgIg77702Ctf+OEfo+AEQCZRfYfJZNcAPszWy9hqBD9qb+DvAh5RIlHmpwU8jpbadIJDixtxXD2af693EDg3f3V2bzFLE/3m3/U/nUzHGPt3//anX+yQY6vmLtBOMvh67smUvh0FKuwBsqOI1QkQIEBgZIHVYEgkJZ13zmbRKyT1RJ7FzTi1PVJvl2XAR+S+trIdMz96gIypb98FCVQVACnIXVIzFXjtW5/ZqCE802xsnayu50etwY8u6NEFuTYJemyNakUCKwIRTGgu7mazAgIgzYVn3IknALJShus8bYe/uhXDOuT/SD0D7n7wp++n4c7yT6sUbi9QYQ+Q7TGsSYAAAQI5Cixvuolz5bfSDUP/2KSxhJuG1sWMm07OFdATfN38WG58gahTeoCMXw5SUISAAEgRxSSR+xAw9NWsGfaqtuDHatCjr4BHBFBqc9rHd8w+lgLteMdlcCwW/1ZGQvNKZTv81QTGtM6LXWpOE9AD5DQdnxEgQIBARgJdIORgPrVIWw2BkDQXSMxflfKXkbakFC0Q88ss0ugCtT0iX2kOkDgGGDKutsIdLz8CIOPZ23NmAl2vgMyStbfkvPjm36pp1I+gR5RnXwGPo4UwnSGwjubc614Ezs1irONiJnx04rlFqRcV5EqTY0/90QwDVjmCHiCVF7DsESBAoD6BZcPnE5Gz85+8dLuGYbGam2RmM0Ng1Vddx8lRew773jg7H3qvi+c+vnMz5qRsjgFD78326xcQAKm/jOVwDYGpD31VevBjiF4ep1UbPUBO0/HZmQKFNY6nE88/pCDI4+6+ObNkmwVigsvZbPFcEZPdr5el+peKu8xqf+gBUnsJyx8BAgSqFrj7we1LVQRB7i1+GsPhLnu5VF1mMrcXgXfufni7zgBB2wvk93tRtJNJCAiATKKYZfI0gakPfVVi8GPfAY+j9UcPkKMiXm8icOHi5ZeXEyDG/Bp5P5YNw4IfGxZTCQ3q7ZjBf71w8crX04XThhmsbPFk8fGfb/4mBfq+Xm1d1wOkskorOwQIEJiewIXPXfl65PrjO7deTPOsFdOb+r6SKuEc8b4Ee5GtQO09mNv8RQ+QOh+FjQpRQyEIgNRQivKwk8DLz3xqp/VLXrmk4Ec3rFXnPdTwVt32T/s7nR4g86dOc/DZdgLRwJru/PrqdmuPs9b5hy/9NjWUf7vaxuGeWJveH/PFN4vo/dHcVbV4T5mmwm8bIx6pcViKGMIu9eL6+UwPkJ6+5TaTs0CN3+GcvaWNwL4FunOW9Nv2cgqCpN/vQoMg+4azvzoF2nP5OvMWuWryN6uyB0hzzbhI14zzeb3ll2HOqguA3Ln+3TcvXv3Zs6nxQcPdkQp3tAH5yMfFvYy78HediLrrSVBc5ndM8P/9//579hOed2UTwYbuMWbQo0tD/J1GD5DFjZTVN1bz7fmkBb4SjajpglMQ5IRqkIJa/zC7l4a+mhc0nNJ89ugJ2Znk29VOTFrCxLHNXX7z11MPuXomh408Rc+b+fwHk/xCjZBpQ8qMgG6XBEYQiEDItIMgi3RXfMYNp+2d+++kBuxXR6ge09rluYzrwbRKYvPczuePbL6SNXYRqC4AEj+GKQjy/MWr/3JzF5ga142G5FwakPvwjbzsGgCJdEQwILbV/e3S1vfrbrt9/t00jbHvWKeP4FGf+ei2dTTokWt9je9SH3Wvy3euf9996bFXck1b6emKhtZ059prxdy51t4h/zV3155S8xaLHy17EpyyUEYfLRb/pmE2o/KYelLSMSYdF1/u7u6tgiOOm4tFkxUN81WUqEwQIJCRwKSDIBFYuJd+X3K9waG9bnjVb19GX5hik7L4ctxkpi4VW4BZJby6AEjoph4gz2SlLDGDCUSD+S4N0d263R393d8uwX297jP41AUwtk1jl+du/bH/rgY9cg14HDU6Wi+Ofu41gbMEDi7a3r9VzvjF7R3aT6Y77t6uqpHyrMJa4/Om98eyoXONxfNYZDH/1d0P/vSLPBKTRyoiwJfq96yW+p3ycnkZtMwDeIqpaO/ui/mefNemWP7yTIDAoAJFnk/3IBKNwencM7b0tR42N8wm7s2eTBv22zeM7nS2GkG+xSJ6rKtL0yn1wXJaZQBkMC0bzk6gj8b8PrZxFkwEQPp87CPNfaZ3dVslBjxW0+85gckKtHdzvRBjLsewA7U0Eu9anstG5uvljeEawyd4HBG4ngIGV9N7aWDx8h/L4Ec0vnuMKRC9rTwIECBAYDiBe4vfZdsbYqhcR4Dh3FAb72G77QTPPWzIJiYvsJi9V5NBc+1452bew9jVBL6SFwGQFQxPyxKInhC79gApK8flpjbKqQsCldLL4zjtrvdNyQGo4/LlvREFoldFG1gYMREb7jpNONlMPDmbfX/DNatbPHp+pEbm8hqY2948VU4qWF0lk6GzBUo8jp6dK0sQIECAwBoCyxtynjj/8KV/L+6ceo38nbhIG2DItye5HiAnFl02Hzh/GqUoYl7NyQVsR5F+cKcCIA+aeKcQgWhINxRR3oX12rc+Mys54NHpRuDjhV/+pXvpL4FeBJbd9h9PDejmrOpFdL8baYa9urf4aTqB3e+Oe9nb/PW7H/5p8gGsEyivn3/480/W4NPMNfR+FZ1ZTiiqWTNcWbqT7vF0MfmHSTV8nSjiAwIECBCYhEDuPUBmi+fS+dSshvOpGutTlEu6lnkr5S3/G7nSMFjnP3np9t0Pbl+qsSzkaX8CAiD7s7YnApMR6Hp8lB78EPiYTJWV0Y0Fpn1R0wQ/Spv0fOMynvAKFQzb0PRO+vPNH5U3NNvm9S6CyenO381XtAYBAgRGFmiGQvnzzd+MnIz1dx9D0aQJuE1IvD7ZYEvm3gMkerjfGyz3NkygSIF0vvrblPCvFJn4ChJdZQDk3Zcee+ULP/xjKp75jysoo96yEL0lSm+Q7g3DhgYViOGuSq5rL775t8ZnukNdLW7cuf7d5wetJDbeCDQNd5/6/NU0uVs0VD5SDEtzUTPNIMhB8KOk8lqtWPdmr124ePnldOfX6ruerwqk72Mq51mpDTzF1dF2CIbvLYcxWS2JtZ4vx1Jea9lRFlrMPh0XvBcuXvn2tnkcJd12SoDA4ALNXE1xPtEMTTn47nbbQZz7zWdxrvrqbhvqf+3md+D9W/1Outl/MvvdYvY9QPrNrq1NXGB5LnX3w9tPFC0xnz2arvmndazKqMBynjZpJ6bUePfmThuwchEC0dDukZdAycNeRY+PCH5E4GO6wY+mPr2hkWZ/36umkTWd1O1vjz3tKS6E03wgqXv7T3raYvabKa5h+TjRdMeg7/dxMCvvNY1RaXLRUh/RKFJYgG7nYFMcj3J9NMfK+dd873ItIOkiMJ5Ac+xLNyY0Q/i1x4p0bhXnVxn+G4/pzD0vj69xQ9G/nblwJQvEzSyph8VrWWdnvvhmc+6cdSIlrgiB5blUXHdGwLOINB9JZHPNXOI1/5F8lPyy2gBIyYUi7esLlNzLYP1clrNkqcGPLvAR83xMPPDRVbZnuyf+7ktg/nqxF20TCYJUEfyI3h+fvfz2vmp12ftZfLnEi/Y2zYsvl22/Weqbhq9oBMq84avki/bNSsTSBAhsImCOhE20Tl52eUPReycvUdcnzW9f7kN2xs0Y0cvdI0+BdqL6PNN2UqrSdedJH+X8fhP8iLRHIMdjNAEBkNHo7bgvgZhvwmN8gZKDHwIfD9SfNx54xxuDCjQXvzGucomPZtiGZjisn0Tja6l35ZxG3zQqx4Tnhd1VfzRPcbegu9CPqpzwOk24GBftJQVBmu9eNDRE2kt6pIvBXY8bZRxDF881w92UVDbSSoDA4AK7Hv8GT+DqDuKcLzWa5pjm5vc6hpfxyEug1OubvBSHSU0E0O4tfjfMxofb6sd3br2Y4zHouBxHOg+CH8ct4L29ClQ5B8heBQvaWdzZXvrcDMdxv/zMp9y1fxzMHt8rMfgRvT5iXhw9PvZYUezqDIH571ODa4wLWs5cIJGj7k6We4vn0txbL6ST0tfSyV41De1x4poaLa+nfJ5Rfpl/nPnd8Vnqtd/F66kOvJ174Kipp3du/uHg+5gl6DGJase9f6cX39wbvpbHyiirXvJ7DGcfb0X6+tjOPreRs+c+HeyLwOACcRxL53vpXC929f3B97fZDq6nc+jN1qhh6Ti/y/zaIfffva4alPb7t+tvX/SaSnl+O13n3OwMyvjbHoNS2rO/3mxufCm010oZdWGzVAqAbOZl6UwFoheIhuxxCkfwYxz34fa6uPbuS4+9Mtz2bfkkgbiDOd0hkmIIZXbtPWh4TSd5cWFcwknpSWUR73cXQeVdFByfqwufu/L1XS+Ujt9y/e9GHUj14UquflFXm3paZpDuneIntNzsK3A9ldXVtErTerjZqvtZOu6sjPmd9rO3HvbSBncv9bAlmyBAYB2BNpj71jqL7nWZCKh3N+Xsdcfj7ayIBuzUK/XjdINGOld5PNfzqCjB5lyqrBtJejmXSOckXx2vBm+557wDsVtmymr7EKh2CKw4uN65/p0r+0C0j/EFoheIobD2Xw6lBj8MebX/umKPExNogiA3/3D+k5dul5jzGEYhLtbiX4npl+b+BZZBkOzujD+4YO8/y/vZYu69NvajYC/bCqShO+5+cFvwY1s/6xGoRCB+CyvJSp3ZSA3WyyBIluV0cC41sQBa0ZUtyipdbzbDS2WakSZtMYSyRzYC1QZAQjjnCPNYNSCG/Kn1EcN7eexHIIJNJQY/Xnzzb7MIfngQyFUg5mhIYyu/lmv6NkpXnJguZp8uKQgSJ6pNett5FNKJdQUT1aU7ItPE59n2XtioTo288Md/vvmbnOYEaS7YU5qKrqc9jg0evZyKGMs6XQznVI9Wv1ZtQ0IMZ1jAox0+rYCESiKBCgVijqx0zpRLzqbc7lPMHfzpnDrHcir2XKqnCcyjF1H6HkdvkjIfGQZBDq4nZ+l8qoZryTJrxrGprjoAcmyOvVmtwDe+9ImmUb7aDGaUsRLnkongh2HSMqpEknKsQI4XBscmdN03uyDIw5d+e777l3pXrLv6vpbr0jaLE9UYRznzsZQ3csn0gnOjPOSycNSLe4t/zKHxenm34s8rqKtf6at4i2BoHa4AAEAASURBVDl+NsfF1HiY2bHwIPhRysV6Kensq4LbDoGcBJpzpcU3cwiCxO9hnMcV1NB4Nd2Y8nZfxVlSA3aUU5RXX3nvbTulnfenm+Wam+Z6AuizPvaUpM02k1EQ5OBcqrQ6tZl4sUtXHQDJ8uCaQVWJyZ9rfQiCDFuypfb8iDov+LFO3VjcuHP9u2+us6RlhhOoqhdIMEUjVRr/Nz37SvM3GpCjp8XIjX/tBXNKR9zBeJi+uroStndIl3tX13Bfs+23HHVl5CBIfHfSUBI/X9bb7fMy9ppp+KKUh++NnYxR9t8G07LpCdIeB9O8HyUFFdr68+oo5WenBPoXuJp+W8oaqiH18k03jny5f4otttiex22x4v5XicbmvgP2yyDI/jOz+R6/EucvubTTRTqa86nN8zHeGnGcODd7q+86NF6GetrzMggS5zNj1a8HzqVKOqfqqRhy30zVAZD2oLC4lnsh7DN9U2gEFgQZpkZF8KPEnh8R/DDs1Xp1IgU/nncytZ7VkEs1ZZBObIfcxyjb7k4C4yI1naSmC/2m8S9OFqNBd+gT1mYfy/20DcjLiX4jLfHo0jcKzgA7jYmBU+NyQRfFAyAMtMmowzH8R9Sn9G+gvTyw2YP9pQBMKtsIKhb/6L1+npu/mo4tvysCpj3mXN9nHTrO5eCC/bgPs35v/vve60/W+ZW4WgXivK+py/PZX4vKYxzD0jxOYx7D2gbsdD5X0GOIIavGavDdmL393UtBkFsvjp3mtu6UeDPJ/PVBemzEEMylBWGPVsC4pkv/9lm/oh415+fNDXXLa8qj6fI6G4G/yyYlAyXk3Zcee+ULP/zjs7PZ/KmBdlHcZmMekAgS1PzogiCR1ykEfYYsy25y+ZhovsSH4Mf6pXbx6s+eiWPm+mtYciiBOLFNdyTF3dFVNHIe67Rs/EsnqvFIQYjFR+mEdZZOIk8M/px111xzMfP+ra8eu7+YhC722e2v/XvsosW/2V7AvHf3g2Zc3+Kzk2UG2q7t1yNtqc42SRyqMfagcemgDs+zJNkoUU2QYv77jdZZY+Eog9Sg/2RatKRjZwRBZkPVn9PYyg1+nJYrnxEgsDeBw95sez+GtQ3Yy5tZ9pbhHXfU3L0/0G94M4dgAXMOtOf/qZH65pdTGX573zffdedUaf9F3kwSIwX0bbbc3vfTEGXP7VjD81i9DYLcd03Z9zlWd82Zrl2fbG7sq/m6Mo9S7SUV1QdAWiXBj15qS2EbiSBI/IteCwIh2xVeBD9KDXxEjmPeDw8CJQrEiWhcFDTdsmsOgqwWzvKCKL3V9siIz9oLxYe6v+muuavJZXWt+54f69Vt49xAF5z3pSCTF3EX6aL/xuVMcpdjMg4CIat35W1zgRoXVKsZXN4p2mw/BfBWPyr8ebp7/8M/fX+wTEQPqLLGX26CIGcFefvyai7c0x24zUV7Xxvd53aifNOt5x4EqhKIIaVKrNbLG1r2FcjtfifjLu8Cj2HvxHE+Ncb2WnUPGrA/eembacOP9LrxoTaWrm/ivD2V57djF9ucM22atOa37883f7Q8PyhryLlNM7vN8u13eZs181un7eHfXlOmc4ZU9m93idy2rnXHntjOwTWnwEfHWsTfiQRAFjf0ADmsj9EjosShjA5zsNkzgZDNvEod6upoLs37cVTk7Nfm/zjbaJ9LLE/Onjj/yUu3C2vI64+pOxHv/s5m11OD8MnbP66B+HDdk9er6ZNoGFzMfzVo43JNXv3m5bB+pjsx04XSy5tu/uCCatMVS1q+6aE0XCtf1P3UEPdWImkDR+XYNPUnpb2ZIHfbC/Szsts0AJXZcHiYtfn8B3q4HXJ4VolA3Lxwb/HpprdqaVlqbza53jUyDnX8CpaD38kCGx4vXLwybI+Hxey9NERnOXUogiDv37oZNzqluvN4lO8QdSd+95Z15w8H368Srw+a86fIyUCP8m4eWQ8i3RDT1LPl0t151norHy61uo26bko6zGPtzyYRAElDujydhsH6tSDIYXWewjBYh7ltn3WBkK5Hw74mgw/rvh+vfeszfW+y2V4Y1fAw78fmpXjn+neuDHHCuXlKrHFU4O4Hty9NOghyFMTr0wU0DJ7us69Pm+73N5/b1+6K2k80OtwbOMX3ZjEkQamP66mB76M0PNXrfQcy0/AWv03b/koLM1wQanD4KN/Z7BeD78cOCOxRoDnfS9/RtMuShvBrhZaNyV1jdmpgHGQOsjiGpYbH8nz2VI/ufnj7icaowDqUfpv+EEwRCOnzmjSCH922D4IfeyqPXneTgh8pgNarzdH0TeaaMw0pm+rE0eyf/fq4G+3OXssSGQlMIgCSkbekZCSwr8b+vvfT9/YyKpLekjJE0Km3xNkQgW0ESh0WYZu8WodALQLH3V3Y3iX70EEWj74++KDSJ83di2kCzzSGdWrcHyyTBfcCaU2aINHiuRT8juFMmkc0THTP1/3bNPz8+eZvDpaP35Lj6uXBAkU8uZrqz9tD1p8iFCSyToE0qXjxGWuPXz9Nx68fNXlJvRKiYX6bfD1wDCtraMNtsjzNdVZ+lz5Ov1mp7rQOW/Zobua3mi+a38+0vVkFv3tNHvoMDE2zoi1zvVLfmneOnosffT1prLoyLwBSV3munZupDYO1NowFixcw9FXxRSgDxwjEHT9xQTDZobCOMfHWMQJp2KWmYbDnsaWP2ZO3thU4etF19PW22y1lvTa/b7mIX6PAWqtHujmQlnf1rrHi4SLNHY7n5gfbKHJ+gcPsHDxTfw4oPKlM4MLnrnw9fW9/Xnwvhzh+dcN5pSGZtjl+RdEeHMPiRTRKltpxrW1Q/d4+jl0xzFbRdagLcjXlvfhmqjtfjuLf6DFfPFrVNVM7NNUPNjLYcuFqjkGb5P/oufjR15tsy7JZCwiAZF08wyZuisNgDStq62MLRPBD749tSmFxbR8n5NukzDqtQJRPGk7gB2lc327iPjQEDgXiInE2b4bLcVf0IYtnGQrsMUgXE82mSXJfK3CS3PsLrrsQ74Z9ab7v9y9y7Ktuvfhw9fmxCxfw5vI4J8hbQFlJ4tYCzfnew5//fdpA+cM8dced9u/XmgDGJjLd+t06R19375fwN6U9TXy+l2H7qqlDbXk/koJebRB/3XIuuZ6cksf91p+NO5yeknIfEchHoNzRcTc3fGM2i8nQPTqB6AXiQaAmgQh+qNebl2iaJ+mVzdeyxr4FmhPfNL9DuoD83b73bX+5C7TBj9xTKX0EUjBib70/ohEohtqqTj0ad9b5V1vGU56jPKNca8ua/BC4X2Cx+R3v928gz1frHLdWl8kzF5unKu7eT8H/zVfcYY30W1vV9cJqvTjr+Q5sWa66x94fB/k/N3+1qvpzkDFPpi4wmQDIsoEvBUE8VgX2NRH46j49JzCEgKGvhlC1zdwEmiCIk9LcimW89MQd0emiOuY7GC8R9kxgTYEUvI1eGWsu3d9igsb9WY61peZYJ/g/Fr/97lkgzvOi0dOjDoFmDpT9nqcdXC/UITjdXCyDH/vq/dFBt/ubR080DwJVCUwmALIstWerKr0eMvPCL//Sw1ZsgsC4Aoa+2sVfz7hd9MZY10XNGOrZ7vMdwY9sy0bCVgVSECImwd333fuxv2by3QiCrDt01Gq6PR9foC23dKzbf/0ZP/NSMEWB5jwvTf48xbxXl+fm+DViQ7JAWtlVKiaB39PQaQ9ARS8i9ecBFm+ULTC1AIgeIMfUV71AjkHxVlEChr7atrgWN1LvuKe3Xdt6IwtozBu5AEbevfIfuQDsfm2BVFebIMTaK/S/YLP/+eyv/W/ZFgcXSOU2dv0ZPI92QOCoQDuEUZrfy6NsgfGGKG0aztuhc9WjEivRyOf5B/WnRDtpJnCCwKQCIO0wWItrJ1hM9m29QCZb9NVk3Lwf1RSljKwp0JyUnpt/b83FLVanQHNHdJ1ZkysCBAgQIDBdAed5tZT9uPO5RD26cPHK47VoTiof6Tpv9F7e92ZPTspcZqsXmFQApPrS3CGDeoHsgGfVUQVefPNvo+6/7J3Pnyo7/dNOfXNR89nLV6atMNHcp3k/0gXttyeae9kuSSANn5BL48uFz135ukk9C6o8cfdr1J8oNw8CExRogiCz2dUJZr2OLDtXq6Mcx8nF1eX3f5y9L/e6DMA4Bo1aCnbep8DkAiB3rn/3zdlML5CjlUgvkKMiXpcgYOLzXUppcePO9e9oPN+FMIN1l+PpOzHNoCz2loTmgvryy/ueS2Fv+bOj6gRyqauRjiZwaFL0UurYOxH8yKX+lIImnQQI5COQ0fHLtUI+1aKolFz47OW3U4LVn6JKTWJPEphcACSjH6GTymS0991JPxq9HW8hEMEPgbst4FZWcTxcwSj46cEdgiOPFVswYTlJF/wop6ykNN1vtPi3WYw/ntGj/d0bcULajCyyTUr8lqUgVQSrnKdkW0oStieB5hwv/fbvaXd204fAwTHs8st9bG7XbcRx9OBaYdeNWX9YgabupF7ebdBh2H2tufWoPzmlZ81kW4zAsQKTC4Acq+DNRiDmUTAUlspQikBMfO5BgEAr0FzYxJwgcZHs7uY6q4XgR53lWmuulsGPZaNLXrlsJxf+XV6JkpoDgXPzh2bn5q8KfhyIeDJxgWYYGkGQgmrB/PUcA7gHQRA3TGVcl+avx/c9y98/x6CM642krSswyQDIchisG+siTWk5jcpTKu1y82roq17K7o1etmIj2QjEhU1zkZwajgRBsimW3RKyvIswAlvZXhDtlkNr1ygQQdjU8yPL4EfybtLlOJlvzRPEz7dspGw0gYMgiMbr0crgzB0vz9kuXMx3mNL2d3n+etND88wMWWCvAstz/b3uc82dNb2IUmCmudFuzXUsRiBHgUkGQOILnIIgz+dYIGOnKXqBGApr7FKw/9MEIvghUHea0DqfLa69+9Jjr6yzpGXKE4iLm2ac+7gD26NcgaaRI+4Eu/1E0/BRbk6kfGoCKbiQa/CjKwrHyU4is78x6Xka+ir3+pOZmuRMRKA9F0iN14IgeZZ46r0W52xZ3r2/ItbUoxie0nXCisqIT5vAWXuj04ipWGvXArFrMVkoY4FJBkAyLo8skmYorCyKQSJOEIjgR9RRj50Ent1pbStnLxAXXzF5rIub7Ivq+AQeBD/S3VYeBEoSKKhhznEys4oVwQ+TnmdWKJKTm4AgSG4lspKedAx76ItPXl55J9unTZA5giAF/WZni7lLwgo833cM2qXArTu2gADI2CWQ6f7dYZ9pwUw8WYa+6q0CGP6qN8p8N3TQuJdvEqXsRIF2DOATP/YBgVwF0lxEJd29f3Cc1Ag0eo0S/Bi9CCSgEIGDBshC0juJZKbfkLsf3L4Uvyml5Lf5rY75Az1GFCjzfN8xaMQqY9c7CUw2ABI/Tneuf+fKTnoVr2worIoLt9CsGfqqr4Iz/FVfkiVsp2nc++xlv3UlFFakMRph0xjAMX50KUmuJZ0X4ntiOIhdi/NqScGPLrPNcfLilcfdCduJ7PlvOu7F96+khsM9C9kdgQcEmgZIkxI/4DLKG9F7LX5DCnwsf7OvFpj0spNcwfl+c63iGFR2PZxg6icbAImydqJ9eo0XBDndx6f7FTD01X697a0egZUgyNXUwPe7enJWXU6uztKdeDlPnlmd+EqGmu9JDBvnO7KistHTIoMfXQ6b8o8GLEGwjmQ/f5cNh67J9sNtL3UJtHdhzzRej1ms6Zyh9N5rgiBjVKD566Wf77fnTemGLUGQbStQui6fvbbtytbbTmDSAZCWbHFtO7pprGU+kGmUc+65NPRVXyW0uHHn+nff7GtrtlOOQJykxgVOMzm6Bt4cC65pPI4y0hA4TvHEuN3st7YvOvjR5bop/3ZMdIHiDmXIv/FblLx974ZEtu3aBZrGa41o4xRzHMPOzV+t4RgmCLKnKrTS86OGehN50Btti7qTjtnNd+7c7K0t1rbKDgKTD4C8+9Jjr+zgN4lVX/jlX2bRAO1BYCwBc9L0I5+CH8/XcLLVj8Y0t9KUf7pYa+44ccE8biWIO82jDLqT4HFTY++dQPP90FOq4zj1b9tboorgR5fP9oK0O0aqB51Lr3+j0TCOfem7tmx063XzNkZgagIaIPdc4stzt7ipqKZj2DIv0Vv8oz2LTmh37ZwftV2POwZtUIXjuu/DP32/WePe7MkN1rRoDwKTD4C0hnqBnFWXBEHOEvL5UAIvvvm3WfRE8thVYHFj1y1Yvw6BuMCJE6927FYNfKOUajQcpzufoxwOToJHSYidNgIrF/tNA4AgyNkVo6vD6Xhy9sJlLXF4jLzybUOi9Vx2KfjRNBrGsa/CutOzls0RWFugOZdoGuY1Xq+NtumCzd37cQy7/HJ419aIHRztcXn+uuEgN60cayy/2vC9xuKlLXJwDCot4ftMb+V1YJ+U2+5LACTJtb1ANA6eVYkEQc4S8nnfAoa+6k9U74/+LGvZUly43f3w9hNNA19zR66L5sHLtun1kYJOEfzQ+Dc499o7ODd/aHXZKJuD4eLiu+FxKDChOnzfMfJQwLNtBZbBjxobDbclsR6BPgXaGypS43X8bsWx2qNvgXfivLn2Y1hTj7rhINWj3epQd840kYbvgyDIyo1FuwFWsvYyeNoeoyvJU6HZ+LtC0y3ZIwlEEOS1b31m9o0vfWKkFNjtVAQi+BH1zYMAgWEFmiBI2sX5hy/9Nl0wPzpbzD6dhia5r0F42BRMYOvLC8jSJ8qstqSOuVBbNnA8EXk+/8lLt1PQ6pFq879uxqIeR/Dug/p6fZxGEMfIpg7EQo6Pp1Ed/9ny+BeO6d/xy3iXAIFeBLoGtvOf+vw/pHO6Hzlm9cC6cgzrYWtFbGJ5k84vmnp0b/FT1wVbFFtzbjn/Vfed3GILRa4S+T3/8OdnKRD7nHqTirC9xmiCp0UWaGWJ1gOksgLdR3b0BNmH8rT3EcEP8370VwfefenRee13K/WnNd0tNY1TH9y+NJuluwc9+hNIJ74R+LibbH0P+2PtdUtnBPyi7NxNO5s19XiiPZeiDjT1YDZ7p9e6V/vG0p3oK3a151b+CGQjEA3YzTHr3Px72SSqxIRM/Bi27BH7eIlFN3qa03dvasGPzrzNt+vJ1iPmfUkjLnhkISAAsiyGNAzW0+m2LmPkr1kto3E65mbwIDCEQNQv834MIWubBM4WiJPWC5+9fCUtefXspS1xokAM95Ic01BKjwt8nKiUxwfH9AA5mrBo/J9yECTqsnqcgkBp0tvm+Bhj7XucLhDHwOR1+kI+JUBgSIHlnfzO57ZBTsd5x7DZLH77m/PZuDZY43xpG+rK1rkaXsvvXmVZWz87MVdOc740xevJ+J7E8aO5Drz88vpqlhxawBBYQwtXuv3VxumXn/lUpbmUrTEETHo+hrp9ErhfYNnQeSt1fe8+uN498fcMgWgYPTd7K100v63B+AyrXD4+owdIJDPK8qEvPvn1j9+/9dXUAPCPqVv/13JJ/mDpWA55lS7g1OUlcvedTnXh5Y/v3Jql7/oLg/mXumHHwFJLTrorFYiG2IPzuRgWy5COp5f0wTHMb18HtfLb9/ikzoM6gPX+NoHG+L6lf+utUfFSK3VmlupM2EznWjL1/nHunGflFgBZKZeYJPji1Z/9cxr+46mVtz09RaALhPzH//0h84Kc4uSj9QRMer6e02ZLLa5ttrylCRwKdHcvuXA+NDn2WXNHXOrq3QQ+2gtmFz/HSuX55pp3NC4v5iIQ8nZq/H6x6sbvdPd+CvK86kL++CobdaEJgrx/663lEtO5sD+eJN5tGn/SXZ9NwMwx8GQonxDYt8AD53NTCeRvBt02YH/YznPlGPYg3n3nQc0NIbMnqz4XepDg/neW50rxZvcdu38Br7o6c3AtWXcgRBAs8yovALJSQMsv5xvpLQGQFZeznkYQJP6ZHP0sKZ+fJmDS89N0tv8sDe/3yvZrW5NAK9Cd1Dcnr/fSxU73cPdzmtwuhsKZz7pxfl0wd5WjoL9r9ABZzc1B43f0AIhHTd+DuJifzX+fgh9vdd/7NpP+PyrQXdTH+2nCz+VxcWKTfnbB32SQjoG/CAvHwFDwIJCnQHdcPwjkd8ms6Xesy9M6f6On42L+q1i0O4ats9rUl+l+/5b1qOWYUh1yrrTxV6A79hxcS84X36ymN1qcC8WcLxOdJ2/jyjDiCgIgx+LHXCB6gRxLc8qbMTn6f/4Pfz/TG+QUJB8dKyD4cSxLD2/q/dEDok2sCCxP7JpGrnTRc7kZAubg84k0/K1cLEfWu8DHAYMn5Qms2QNkNWPLi//vx3up8Xv5UaHfgTb/aXLv+e/T0G0vL/O2ml3PzxDojgPpwv6tFBTtgiFfThfE9Q2V1jX8NCaHwd8ziHxMgEBGAqu/YZGs4n/HNrFdPYZFsP+DNni7ySYs2wqs1qPq65BzpV6qfXcteXi+tCj3XOngmjCdCwl+9FI/ht6IAMgR4bhb+gs//GO8qxfIEZt1XnZDYsWy3/jSJ9ZZxTITFxD8GKoCLG7o/TGUre2GwOpFT7xuLnzupZPYeMxnj1Z0V0+6I37lEcMCuVheAang6YY9QI7m+KDxOwIh8R0oof43F22z97q83P3w9hPxPOWle8vfLQS6C/tYtQ0S3/z5wWZKD4Y0jYbtRPCCZAel6gmBKgQe+B3rclXC71mX1tP+Lo9fsUhMbO4YdhrWdp8dW4dKrz8HQY/WxLnSdnXjuLW686X7zpVKOE9aOZakm1xcEx5XuBm/JwByTOGkuUDevHj1X358zEfeWkOgGxJLb5A1sCa+iODHxCuA7Fcl0F34RKbSXT3/MIuJNlcfJUy6GRc689lfD5K9mL3XXewcvOdJfQLtBe7O+eq+Aw/U/1zqfgQ9ukca8qNLb/eWv/0KLBvYmsBSbPn8w5d+2wTH4sVi9ul04fxQPM3ycfRYmBLZHQvT3yyTPNlERQNjDY+cvw81+K6Zh6O/C03j5J9v/ua+1XM/fkViV49hR87lHMPuK83eX6zWoQfOh2JvuZwTnZTz1XOlmXOlk5j6en/1XOn8Jy8dnmDkcpxZPZakTHfnQn3l33b2KyAAcox3fAnvXP/OlRQEuXnMx95aU0AgZE2oiS4m+DFkwS+u6f0xpK9tnyXQ3dWzulzT+Jf7nT3Gb10tsuk877nhbbX+N41H79/K4nzywueufN1dr+NV69WL5tRj7icpJS+Ml5qz9jx/PfV0a4Z4O2tJn48skBp3R06B3VcssPzNuLSaxeZ8bjbLe3g/53OrRTba89XzoS4RuV8POFfqSmr/f+9+cPvgWJPPeZLzof3XhOH2OB9u02VvOS5YBUD6K8PoDRIP84P0Z1ryll5882+z1eHSSs5LfmkX/MivTKQoBOJ39ajEx+/f+mp67/rR9wd/nSYuv3Dx8stH96Nx+KjI7q+bAMCdm3/I/W73NCTG40OV/9G6n+bOeXHQidPbHi3vxDAfqyU4VP5W9+H5+gJH60Ws+XHcab3vu2NTfYn6v5pydeVQ47hyOvw0j2c1lBfnPOrSOqk4qazSOd3+g/1pOJqjv3WRhxq+E+uURYnLHK0/rgVKLMXh03y0nsQe93iMuXrhs5ff7nI55PHkuHx2+83l75D533ceBUBOEI+KePHqz55JffQMhXWC0TZvC4Rso1bPOtHr47/9j48EPwYtUgGQQXltvHeB+L2Ni5840dzX38hETSdzvRdKjxtsyjf3AEjKb6p/V/ZVJ86q880k2ufO6B0QYxCnsYdP+97sKz89VpfJb+qsutGU9500r8i6veliKI/5/Aen1ZNAV1cmX/UAENhZYK3jV8/ne5Fox6+di270DcRQWaf9Ti2DJDG02U/XuqEm3eiUbjR567RtqjujF/vGCWiGVEtrnVSu6aN1bqq7Gjs+aRvxvmNKCNX5EAA5o1zThOj/JAhyBtKWH3dzhMTqJkzfErGQ1QQ+9lVQixtpDqPn/Wjvy9t+CBA4S6CIAMjyDvhcjp1dI9Jpti7QTtOp97OoG5G7g8agNbK6HIJkjSUtQoAAAQIE8hXoGsDPSqHfvbOE6vx8nfqhbtRZ9uvmSgBkDakv/PC9xRqLWWRLgdVeIbEJwZAtITNcrQt8RNIMeTV8AcXcRbk04A2fW3sgQKAEgSICIAkyBRQcP0uoUNJIgAABAgQIECBAgACBDQVMgr4W2OKaXiBrQW21UNcwHn8jGBJDJMVcIasPQZFVjbyfR9AjHlGO8ejKt3nhvwEFFjcG3LhNEyBAoF6Bds6MevMnZwQIECBAgAABAgQIEJiwgB4gaxZ+Ggrr1ykI8tSai1usJ4Gud0hsbjUoEgGRaGjvAiOrz3vatc2cIdCZdwGPbnFzfHQS+/2r98d+ve2NAIH1BPQAWc/JUgQIECBAgAABAgQIECAwjIAeIMO42mpPAqu9B1afx+YjOPLCL//S/I3XXY+DeO6xHwHBjv042wsBAgQIDCigB8iAuDZNgAABAgQIECBAgACBcQX0ANnAXy+QDbAsSoDA3gTefelRx/K9adsRAQKbCOgBsomWZQkQIECAAAECBAgQIECgb4FzfW+w5u29+9JjT89mMR+IBwECBPIQiKGv8kiJVBAgQKBQAT1ACi04ySZAgAABAgQIECBAgMDZAgIgZxtZggABAtkKfPSvb93KNnESRoAAgRIEzs0fKiGZ0kiAAAECBAgQIECAAAECmwsIgGxoduf6d9/UC2RDNIsTIDCAwOKGY9EArDZJgMD0BPQAmV6ZyzEBAgQIECBAgAABApMREADZsKjdbb0hmMUJEBhMIA3L98pgG7dhAgQITEVAD5CplLR8EiBAgAABAgQIECAwQQEBkC0KfdkLJN197UGAAIHRBN4Ybc92TIAAgZoE9ACpqTTlhQABAgQIECBAgAABAvcJCIDcx7Hei+gFkoIgz6fhZwRB1iOzFAECvQm0Q1/p/dEbqA0RIDB1AT1Apl4D5J8AAQIECBAgQIAAgYoFBEC2LNwIgqQGyKe3XN1qBAgQ2FbgDcGPbemsR4AAgWME9AA5BsVbBAgQIECAAAECBAgQqENAAGSHcnzoi09e3mF1qxIgQIAAAQIECIwtoAfI2CVg/wQIECBAgAABAgQIEBhMQABkB9p2KKzvXNlhE1YlQIDABgKLa3p/bMBlUQIECKwjoAfIOkqWIUCAAAECBAgQIECAQJECAiA7FtthEMR8IDtSWp0AgVMFBD9O5fEhAQIEthXQA2RbOesRIECAAAECBAgQIEAgewEBkB6KKIIgPWzGJggQIHCCgODHCTDeJkCAwO4CeoDsbmgLBAgQIECAAAECBAgQyFRAAKS/gnmjv03ZEgECBA4FDHt1aOEZAQIEehfQA6R3UhskQIAAAQIECBAgQIBALgICID2VRNtAubg2mxkKqydSmyFAoBFwTFERCBAgMKiAHiCD8to4AQIECBAgQIAAAQIExhQQAOlRf3mXduoJosGyR1abIjBhgcWNdFx5esIAsk6AAIHhBfQAGd7YHggQIECAAAECBAgQIDCSgABIz/CHQZCeN2xzBAhMTEDwY2IFLrsECIwloAfIWPL2S4AAAQIECBAgQIAAgcEFBEAGJ7YDAgQIECBAgACBbAX0AMm2aCSMAAECBAgQIECAAAECuwoIgOwqeMz6h/OBHPOhtwgQIHCmgN4fZxJZgAABAn0J6AHSl6TtECBAgAABAgQIECBAIDsBAZCBikQQZCBYmyVQvcDixp3r332++mzKIAECBHIR0AMkl5KQDgIECBAgQIAAAQIECPQuIADSO+nhBgVBDi08I0BgHYHFtQh+fPSvb91aZ2nLECBAgEAPAnqA9IBoEwQIECBAgAABAgQIEMhTQABk4HIRBBkY2OYJVCPQ9Px4U/CjmgKVEQIEShHQA6SUkpJOAgQIECBAgAABAgQIbCwgALIx2eYrLIMgNzZf0xoECExFQM+PqZS0fBIgkJ2AHiDZFYkEESBAgAABAgQIECBAoC8BAZC+JM/ezhtnL2IJAgSmKbAQIJ1mwcs1AQI5COgBkkMpSAMBAgQIECBAgAABAgQGERAAGYT1wY0aCutBE+8QINAKpOPD04a+UhsIECAwkoAeICPB2y0BAgQIECBAgAABAgSGFxAAGd74YA+CIAcUnhAg0Agsbrz70qNzGAQIECAwooAeICPi2zUBAgQIECBAgAABAgSGFRAAGdb3ga0LgjxA4g0CExVoJj1/fqKZl20CBAjkI6AHSD5lISUECBAgQIAAAQIECBDoWUAApGfQdTYnCLKOkmUI1CzQBj8Me1VzGcsbAQLFCOgBUkxRSSgBAgQIECBAgAABAgQ2FRAA2VSsp+UFQXqCtBkCxQkIfhRXZBJMgEDdAnqA1F2+ckeAAAECBAgQIECAwKQFBEBGLH5BkBHx7ZrAKAKCH6Ow2ykBAgROE9AD5DQdnxEgQIAAAQIECBAgQKBoAQGQkYtPEGTkArB7AnsTEPzYG7UdESCQl4AAQ17lITUECBAgQIAAAQIECBCYkMB8QnnNOqtf+OEffz2bzZ/KOpESR4DAlgKLGynY+fSWK1uNAAECRQucf/jSb3PPwIWLV75tXqbcS0n6CBAgQIAAAQIECBAgsLmAAMjmZoOtkYIg/5SCID8ebAc2TIDAKALvvvSoY+0o8nZKgAABAgQIECBAgAABAgQIECAwZQFDYGVU+obDyqgwJIVALwLR80PwoxdKGyFAgAABAgQIECBAgAABAgQIECCwoYC7kjcE28fieoLsQ9k+CAwtYNiroYVtnwABAgQIECBAgAABAgQIECBAgMBpAnqAnKYz0md6gowEb7cEehNoJzzvbXM2RIAAAQIECBAgQIAAAQIECBAgQIDAxgJ6gGxMtr8V9ATZn7U9EehPoA1+mEy3P1FbIkCAAAECBAgQIECAAAECBAgQILCNgADINmp7XEcQZI/YdkVgZwHBj50JbYAAAQIECBAgQIAAAQIECBAgQIBATwICID1BDrkZQZAhdW2bQF8Cgh99SdoOAQIECBAgQIAAAQIECBAgQIAAgT4EBED6UNzDNlIQ5Nez2fypPezKLggQ2FjAhOcbk1mBAAECBAgQIECAAAECBAgQIECAwMACAiADA/e5eT1B+tS0LQL9Cbz70qOOpf1x2hIBAgQIECBAgAABAgQIECBAgACBXgTO9bIVG9mLwLsvPfbKbLa4tped2QkBAmsIRM8PwY81oCxCgAABAgQIECBAgAABAgQIECBAYO8C7lreO/nuO9QTZHdDWyCwu4Bhr3Y3tAUCBAgQIECAAAECBAgQIECAAAECwwnoATKc7WBb1hNkMFobJrCmQDvh+ZoLW4wAAQIECBAgQIAAAQIECBAgQIAAgREE9AAZAb2vXeoJ0pek7RDYRKANfnz0r2/d2mQtyxIgQIAAAQIECBAgQIAAAQIECBAgsF8BAZD9eve+tzYIEpud/7j3jdsgAQIrAosb6cUbd65/903BjxUWTwkQIECAAAECBAgQIECAAAECBAhkKiAAkmnBbJosvUE2FbM8gU0EzPexiZZlCRAgQIAAAQIECBAgQIAAAQIECOQgIACSQyn0lAZBkJ4gbYbAfQKCH/dxeEGAAAECBAgQIECAAAECBAgQIECgEAEBkEIKat1kCoKsK2U5AusICH6so2QZAgQIECBAgAABAgQIECBAgAABAjkKCIDkWCo7pkkQZEdAqxNoBAQ/VAQCBAgQIECAAAECBAgQIECAAAECJQsIgJRceqek/aEvPnk5Pr549V9unrKYjwgQeEBgcc1E5w+geIMAAQIECBAgQIAAAQIECBAgQIBAcQICIMUV2WYJjkCIIMhmZpaessDi2rsvPfbKlAXknQABAgQIECBAgAABAgQIECBAgEAtAudryYh8HC/wv/76xw8++dS1D9Kn/zX9+99ms3nTM+T4pb1LYMoCgh9TLn15J0CAAAECBAgQIECAAAECBAgQqE9AD5D6yvTEHLVzg8yeTUGQp05cyAcEJiewuBZZ1vNjcgUvwwQIECBAgAABAgQIECBAgAABApULCIBUXsBHsycIclTE62kL6PUx7fKXewIECBAgQIAAAQIECBAgQIAAgZoFBEBqLt0T8tbOC/Kzf24/1hvkBCZvVy2wuJGy94ZeH1UXsswRIECAAAECBAgQIECAAAECBAhMXEAAZOIV4As/fG8xcQLZn5yAXh+TK3IZJkCAAAECBAgQIECAAAECBAgQmKSAAMgki/3+TAuC3O/hVc0Cgh81l668ESBAgAABAgQIECBAgAABAgQIEFgVEABZ1Zj48zQ/yK9NkD7xSlBp9u9c/86Vj/71rVuVZk+2CBAgQIAAAQIECBAgQIAAAQIECBA4RkAA5BiUqb4Vc4NE3i9e/dkzKRDy46k6yHc9AhH4iNwIftRTpnJCgAABAgQIECBAgAABAgQIECBAYF2B8+suaLn6Bf7XX//4Qfz76P/7f97/+//j/0x3y8//U/25lsM6BRY37lz/7n+MwEfU6TrzKFcECBAgQIAAAQIECBAgQIAAAQIECJwmoAfIaToT/ywNifVPLYHeIBOvCgVlf3EjJfaNSPC7Lz32SkEJl1QCBAgQIECAAAECBAgQIECAAAECBHoWEADpGbTGzS0DIc+aH6TG0q0lT03gY5Z6fTxvuKtaylQ+CBAgQIAAAQIECBAgQIAAAQIECOwmIACym9+k1j4MhES2509NKvMym6lAG/hIvT2ezjSBkkWAAAECBAgQIECAAAECBAgQIECAwEgCAiAjwZe82zYQYlisksuwjrQvbgh81FGSckGAAAECBAgQIECAAAECBAgQIEBgCAEBkCFUJ7DNh7745OWLV//l5gSyKotZCiyumeMjy4KRKAIECBAgQIAAAQIECBAgQIAAAQLZCAiAZFMUZSZEIKTMcis31QIf5ZadlBMgQIAAAQIECBAgQIAAAQIECBDYr4AAyH69q9xbBEEiYxev/uyfzQ1SZRFnkKnFtTTB+ZsmOM+gKCSBAAECBAgQIECAAAECBAgQIECAQCECAiCFFFQJyWx7g/zsmcO0mifk0MKz7QQW12I9w11tp2ctAgQIECBAgAABAgQIECBAgAABAlMWEACZcukPnPd2svTYiUDIwNQVbX5xI2XmjS5DAh+dhL8ECBAgQIAAAQIECBAgQIAAAQIECGwqIACyqZjlNxZYBkKeNTzWxnQTWqEJfMzSMFfPG+ZqQsUuqwQIECBAgAABAgQIECBAgAABAgQGFBAAGRDXpu8XOAyExPvzp+7/1KtpCrSBj9TT4+lp5l+uCRAgQIAAAQIECBAgQIAAAQIECBAYSkAAZChZ2z1R4DAQIghyIlL1Hwh8VF/EMkiAAAECBAgQIECAAAECBAgQIEBgZAEBkJELwO5nsy/88L0Fh6kILK6Z12MqZS2fBAgQIECAAAECBAgQIECAAAECBMYVEAAZ19/ejwik3iG/NjzWEZTCX965/p0r5vUovBAlnwABAgQIECBAgAABAgQIECBAgECBAgIgBRZa7Ul+6ItPXo48Xrz6s2dSMOTHtee3zvwtbsSE5pE3wY86S1iuCBAgQIAAAQIECBAgQIAAAQIECOQuIACSewlNPH3L+UI6hWf1Dukocvy7uNalKgU/3hT46DT8JUCAAAECBAgQIECAAAECBAgQIEBgDAEBkDHU7XMrAcGQrdgGXOkw4BE7MbfHgNQ2TYAAAQIECBAgQIAAAQIECBAgQIDAxgICIBuTWSEHgRgmqx0ia5Z6hczeSP/0Dhm8YBY3lrsIbwGPwb3tgAABAgQIECBAgAABAgQIECBAgACBXQQEQHbRs25WAsseIhEQWXnMn1p54elGAgcBj2atmNPDsFYbAVqYAAECBAgQIECAAAECBAgQIECAAIERBQRARsS36+EFvvDD9xazWTTkRyCk+zv8fsvbQ2dz8PeaIa3KK0UpJkCAAAECBAgQIECAAAECBAgQIEDgUEAA5NDCswkItL1E5j+eQFbXzuK7Lz3qOLC2lgUJECBAgAABAgQIECBAgAABAgQIEChFQMNnKSUlnb0KxBwiR4dzSsGRX7c9RXrdVRYbu3P9O1eO5jeLhEkEAQIECBAgQIAAAQIECBAgQIAAAQIEBhIQABkI1mbLE4igyGmpTpOu/3O+AZLFtTRHx5snpV/w4yQZ7xMgQIAAAQIECBAgQIAAAQIECBAgUKvA39WaMfkisKlAyUGCCH6UnP5Ny8ryBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEA0pIIEAAAN8UlEQVSAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwP/fDh0LAAAAAAzytx7FvkLIgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYMGDAgAEDBgwYOAYCR0MRkUfqHdUAAAAASUVORK5CYII="/>
+</defs>
+</svg>

From ed5b78d61ba42ac85a0382072811554795fb7b7b Mon Sep 17 00:00:00 2001
From: Garrett Bear <gwhisten@gmail.com>
Date: Thu, 23 Mar 2023 08:24:23 -0700
Subject: [PATCH 058/129] Feat/add header base component (#18043)

* add header base component

* fix resizing issue

* add center

* add demo

* header base using flexbox

* fix button issue

* header base clean up

* update tests

* add readme description

* add docs

* update snapshot

* add more to readme

* convert to TS

* fix file name

* fix types and colors

* fix classname error

* fix boxprops import

* fix boxprops

* prop fix

* fix errors

* Update ui/components/component-library/header-base/header-base.stories.tsx

Co-authored-by: George Marshall <george.marshall@consensys.net>

* Update ui/components/component-library/header-base/header-base.types.ts

Co-authored-by: George Marshall <george.marshall@consensys.net>

* Update ui/components/component-library/header-base/header-base.types.ts

Co-authored-by: George Marshall <george.marshall@consensys.net>

* headerbase fixes

* fix export

* remove Math.max

* change order for index on storybook to prep build

* revert back to order

* remove type from export

* add type to export

* change export of headerbase function

* export update

* revert back to normal

* add type to export

* Removing interface export from index

---------

Co-authored-by: George Marshall <george.marshall@consensys.net>
---
 .../component-library/header-base/README.mdx  | 114 +++++++
 .../__snapshots__/header-base.test.tsx.snap   |  17 +
 .../header-base/header-base.stories.tsx       | 293 ++++++++++++++++++
 .../header-base/header-base.test.tsx          |  61 ++++
 .../header-base/header-base.tsx               | 117 +++++++
 .../header-base/header-base.types.ts          |  33 ++
 .../component-library/header-base/index.ts    |   2 +
 ui/components/component-library/index.js      |   1 +
 8 files changed, 638 insertions(+)
 create mode 100644 ui/components/component-library/header-base/README.mdx
 create mode 100644 ui/components/component-library/header-base/__snapshots__/header-base.test.tsx.snap
 create mode 100644 ui/components/component-library/header-base/header-base.stories.tsx
 create mode 100644 ui/components/component-library/header-base/header-base.test.tsx
 create mode 100644 ui/components/component-library/header-base/header-base.tsx
 create mode 100644 ui/components/component-library/header-base/header-base.types.ts
 create mode 100644 ui/components/component-library/header-base/index.ts

diff --git a/ui/components/component-library/header-base/README.mdx b/ui/components/component-library/header-base/README.mdx
new file mode 100644
index 000000000..ab8c671a5
--- /dev/null
+++ b/ui/components/component-library/header-base/README.mdx
@@ -0,0 +1,114 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+import { HeaderBase } from './header-base';
+
+### This is a base component. It should not be used in your feature code directly but as a "base" for other UI components
+
+# HeaderBase
+
+The `HeaderBase` component is a reusable UI component for displaying a header with optional startAccessory, children (title) and endAccessory content areas. It is designed to be flexible and customizable for various use cases to keep a visually balanced appearance.
+
+<Canvas>
+  <Story id="components-componentlibrary-headerbase--default-story" />
+</Canvas>
+
+## Props
+
+The `HeaderBase` accepts all props below as well as all [Box](/docs/components-ui-box--default-story#props) component props
+
+<ArgsTable of={HeaderBase} />
+
+### Children
+
+Wrapping content in the `HeaderBase` component will be rendered in the center of the header.
+
+Use the `childrenWrapperProps` prop to customize the wrapper element around the `children` content.
+
+<Canvas>
+  <Story id="components-componentlibrary-headerbase--children" />
+</Canvas>
+
+```jsx
+import { HeaderBase, Text } from '../../component-library';
+import {
+  TEXT_ALIGN,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+
+<HeaderBase>
+  <Text variant={TextVariant.headingSm} textAlign={TEXT_ALIGN.CENTER}>
+    Title is sentence case no period
+  </Text>
+</HeaderBase>;
+```
+
+### startAccessory
+
+Using the `startAccessory` prop will render the content in the start (left) side of the header.
+
+Use the `startAccessoryWrapperProps` prop to customize the wrapper element around the `startAccessory` content.
+
+<Canvas>
+  <Story id="components-componentlibrary-headerbase--start-accessory" />
+</Canvas>
+
+```jsx
+import { HeaderBase, Text } from '../../component-library';
+import {
+  TEXT_ALIGN,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+
+<HeaderBase
+  startAccessory={
+    <ButtonIcon
+      size={BUTTON_ICON_SIZES.SM}
+      iconName={ICON_NAMES.ARROW_LEFT}
+      ariaLabel="back"
+    />
+  }
+>
+  <Text variant={TextVariant.headingSm} textAlign={TEXT_ALIGN.CENTER}>
+    Title is sentence case no period
+  </Text>
+</HeaderBase>;
+```
+
+### endAccessory
+
+Using the `endAccessory` prop will render the content in the end (right) side of the header.
+
+Use the `endAccessoryWrapperProps` prop to customize the wrapper element around the `endAccessory` content.
+
+<Canvas>
+  <Story id="components-componentlibrary-headerbase--end-accessory" />
+</Canvas>
+
+```jsx
+import { HeaderBase, Text } from '../../component-library';
+import {
+  TEXT_ALIGN,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+
+<HeaderBase
+  endAccessory={
+    <ButtonIcon
+      size={BUTTON_ICON_SIZES.SM}
+      iconName={ICON_NAMES.CLOSE}
+      ariaLabel="close"
+    />
+  }
+>
+  <Text variant={TextVariant.headingSm} textAlign={TEXT_ALIGN.CENTER}>
+    Title is sentence case no period
+  </Text>
+</HeaderBase>;
+```
+
+### Use Case Demos
+
+Some examples of how the `HeaderBase` component can be used in various use cases with background colors set for visual aid.
+
+<Canvas>
+  <Story id="components-componentlibrary-headerbase--use-case-demos" />
+</Canvas>
diff --git a/ui/components/component-library/header-base/__snapshots__/header-base.test.tsx.snap b/ui/components/component-library/header-base/__snapshots__/header-base.test.tsx.snap
new file mode 100644
index 000000000..6253be824
--- /dev/null
+++ b/ui/components/component-library/header-base/__snapshots__/header-base.test.tsx.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`HeaderBase should render HeaderBase element correctly 1`] = `
+<div>
+  <div
+    class="box mm-header-base box--display-flex box--flex-direction-row box--justify-content-space-between"
+    data-testid="header-base"
+    title="HeaderBase test"
+  >
+    <div
+      class="box mm-header-base__children box--flex-direction-row box--width-full"
+    >
+      should render HeaderBase element correctly
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/component-library/header-base/header-base.stories.tsx b/ui/components/component-library/header-base/header-base.stories.tsx
new file mode 100644
index 000000000..be26fe874
--- /dev/null
+++ b/ui/components/component-library/header-base/header-base.stories.tsx
@@ -0,0 +1,293 @@
+import React from 'react';
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+import Box from '../../ui/box';
+import {
+  ICON_NAMES,
+  Button,
+  ButtonIcon,
+  BUTTON_ICON_SIZES,
+  BUTTON_SIZES,
+  Text,
+} from '..';
+import {
+  AlignItems,
+  BackgroundColor,
+  TextVariant,
+  TEXT_ALIGN,
+} from '../../../helpers/constants/design-system';
+import { HeaderBase } from './header-base';
+import README from './README.mdx';
+
+export default {
+  title: 'Components/ComponentLibrary/HeaderBase',
+  component: HeaderBase,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+} as ComponentMeta<typeof HeaderBase>;
+
+const Template: ComponentStory<typeof HeaderBase> = (args) => (
+  <HeaderBase {...args} />
+);
+
+export const DefaultStory = Template.bind({});
+
+DefaultStory.args = {
+  children: (
+    <Text variant={TextVariant.headingSm} textAlign={TEXT_ALIGN.CENTER}>
+      Title is sentence case no period
+    </Text>
+  ),
+  startAccessory: (
+    <ButtonIcon
+      size={BUTTON_ICON_SIZES.SM}
+      iconName={ICON_NAMES.ARROW_LEFT}
+      ariaLabel="back"
+    />
+  ),
+  endAccessory: (
+    <ButtonIcon
+      size={BUTTON_ICON_SIZES.SM}
+      iconName={ICON_NAMES.CLOSE}
+      ariaLabel="close"
+    />
+  ),
+};
+
+DefaultStory.storyName = 'Default';
+
+export const Children = (args) => {
+  return (
+    <HeaderBase {...args}>
+      <Text variant={TextVariant.headingSm} textAlign={TEXT_ALIGN.CENTER}>
+        Title is sentence case no period
+      </Text>
+    </HeaderBase>
+  );
+};
+
+export const StartAccessory = (args) => {
+  return (
+    <HeaderBase
+      marginBottom={4}
+      startAccessory={
+        <ButtonIcon
+          size={BUTTON_ICON_SIZES.SM}
+          iconName={ICON_NAMES.ARROW_LEFT}
+          ariaLabel="back"
+        />
+      }
+      {...args}
+    >
+      <Text variant={TextVariant.headingSm} textAlign={TEXT_ALIGN.CENTER}>
+        Title is sentence case no period
+      </Text>
+    </HeaderBase>
+  );
+};
+
+export const EndAccessory = (args) => {
+  return (
+    <HeaderBase
+      marginBottom={4}
+      endAccessory={
+        <ButtonIcon
+          size={BUTTON_ICON_SIZES.SM}
+          iconName={ICON_NAMES.CLOSE}
+          ariaLabel="close"
+        />
+      }
+      {...args}
+    >
+      <Text variant={TextVariant.headingSm} textAlign={TEXT_ALIGN.CENTER}>
+        Title is sentence case no period
+      </Text>
+    </HeaderBase>
+  );
+};
+
+export const UseCaseDemos = (args) => (
+  <>
+    <Text>children only assigned</Text>
+    <Box backgroundColor={BackgroundColor.warningAlternative}>
+      <HeaderBase marginBottom={4} {...args}>
+        <Text
+          variant={TextVariant.headingSm}
+          textAlign={TEXT_ALIGN.CENTER}
+          backgroundColor={BackgroundColor.primaryAlternative}
+        >
+          Title is sentence case no period
+        </Text>
+      </HeaderBase>
+    </Box>
+    <Text>children and endAccessory assigned </Text>
+    <Box backgroundColor={BackgroundColor.warningAlternative}>
+      <HeaderBase
+        marginBottom={4}
+        endAccessory={
+          <ButtonIcon
+            backgroundColor={BackgroundColor.goerli}
+            size={BUTTON_ICON_SIZES.SM}
+            iconName={ICON_NAMES.CLOSE}
+            ariaLabel="close"
+          />
+        }
+        {...args}
+      >
+        <Text
+          variant={TextVariant.headingSm}
+          textAlign={TEXT_ALIGN.CENTER}
+          backgroundColor={BackgroundColor.primaryAlternative}
+        >
+          Title is sentence case no period
+        </Text>
+      </HeaderBase>
+    </Box>
+    <Text>children and startAccessory assigned </Text>
+    <Box backgroundColor={BackgroundColor.warningAlternative}>
+      <HeaderBase
+        marginBottom={4}
+        startAccessory={
+          <ButtonIcon
+            backgroundColor={BackgroundColor.successAlternative}
+            size={BUTTON_ICON_SIZES.SM}
+            iconName={ICON_NAMES.ARROW_LEFT}
+            ariaLabel="back"
+          />
+        }
+        {...args}
+      >
+        <Text
+          variant={TextVariant.headingSm}
+          textAlign={TEXT_ALIGN.CENTER}
+          backgroundColor={BackgroundColor.primaryAlternative}
+        >
+          Title is sentence case no period
+        </Text>
+      </HeaderBase>
+    </Box>
+    <Text>children, startAccessory, and endAccessory assigned </Text>
+    <Box backgroundColor={BackgroundColor.warningAlternative}>
+      <HeaderBase
+        marginBottom={4}
+        startAccessory={
+          <ButtonIcon
+            backgroundColor={BackgroundColor.successAlternative}
+            size={BUTTON_ICON_SIZES.SM}
+            iconName={ICON_NAMES.ARROW_LEFT}
+            ariaLabel="back"
+          />
+        }
+        endAccessory={
+          <ButtonIcon
+            backgroundColor={BackgroundColor.goerli}
+            size={BUTTON_ICON_SIZES.SM}
+            iconName={ICON_NAMES.CLOSE}
+            ariaLabel="close"
+          />
+        }
+        {...args}
+      >
+        <Text
+          variant={TextVariant.headingSm}
+          textAlign={TEXT_ALIGN.CENTER}
+          backgroundColor={BackgroundColor.primaryAlternative}
+        >
+          Title is sentence case no period
+        </Text>
+      </HeaderBase>
+    </Box>
+    <Text>children, startAccessory, and endAccessory assigned </Text>
+    <Box backgroundColor={BackgroundColor.warningAlternative}>
+      <HeaderBase
+        marginBottom={4}
+        startAccessory={
+          <Button
+            backgroundColor={BackgroundColor.successAlternative}
+            style={{ whiteSpace: 'nowrap' }}
+            size={BUTTON_SIZES.SM}
+          >
+            Unlock Now
+          </Button>
+        }
+        endAccessory={
+          <ButtonIcon
+            backgroundColor={BackgroundColor.goerli}
+            size={BUTTON_ICON_SIZES.SM}
+            iconName={ICON_NAMES.CLOSE}
+            ariaLabel="close"
+          />
+        }
+        {...args}
+      >
+        <Text
+          variant={TextVariant.headingSm}
+          textAlign={TEXT_ALIGN.CENTER}
+          backgroundColor={BackgroundColor.primaryAlternative}
+        >
+          Title is sentence case no period
+        </Text>
+      </HeaderBase>
+    </Box>
+    <Text>
+      children, startAccessory, and endAccessory assigned with prop alignItems=
+      {AlignItems.center} passed at HeaderBase
+    </Text>
+    <Box backgroundColor={BackgroundColor.warningAlternative}>
+      <HeaderBase
+        marginBottom={4}
+        alignItems={AlignItems.center}
+        startAccessory={
+          <ButtonIcon
+            backgroundColor={BackgroundColor.successAlternative}
+            size={BUTTON_ICON_SIZES.SM}
+            iconName={ICON_NAMES.CLOSE}
+            ariaLabel="close"
+          />
+        }
+        endAccessory={
+          <Button
+            backgroundColor={BackgroundColor.goerli}
+            size={BUTTON_SIZES.SM}
+          >
+            Download
+          </Button>
+        }
+        {...args}
+      >
+        <Text
+          variant={TextVariant.headingSm}
+          textAlign={TEXT_ALIGN.CENTER}
+          backgroundColor={BackgroundColor.primaryAlternative}
+        >
+          Title is sentence case no period
+        </Text>
+      </HeaderBase>
+    </Box>
+    <Text>startAccessory and endAccessory assigned </Text>
+    <Box backgroundColor={BackgroundColor.warningAlternative}>
+      <HeaderBase
+        marginBottom={4}
+        startAccessory={
+          <Button
+            backgroundColor={BackgroundColor.successAlternative}
+            size={BUTTON_SIZES.SM}
+          >
+            Unlock
+          </Button>
+        }
+        endAccessory={
+          <ButtonIcon
+            backgroundColor={BackgroundColor.goerli}
+            size={BUTTON_ICON_SIZES.SM}
+            iconName={ICON_NAMES.CLOSE}
+            ariaLabel="close"
+          />
+        }
+        {...args}
+      ></HeaderBase>
+    </Box>
+  </>
+);
diff --git a/ui/components/component-library/header-base/header-base.test.tsx b/ui/components/component-library/header-base/header-base.test.tsx
new file mode 100644
index 000000000..9d4ccec69
--- /dev/null
+++ b/ui/components/component-library/header-base/header-base.test.tsx
@@ -0,0 +1,61 @@
+/* eslint-disable jest/require-top-level-describe */
+import { render } from '@testing-library/react';
+import React from 'react';
+import { Icon, ICON_NAMES } from '..';
+import { HeaderBase } from './header-base';
+
+describe('HeaderBase', () => {
+  it('should render HeaderBase element correctly', () => {
+    const { getByTestId, container } = render(
+      <HeaderBase data-testid="header-base" title="HeaderBase test">
+        should render HeaderBase element correctly
+      </HeaderBase>,
+    );
+    expect(getByTestId('header-base')).toHaveClass('mm-header-base');
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render with added classname', () => {
+    const { getByTestId } = render(
+      <HeaderBase
+        className="mm-header-base--test"
+        data-testid="header-base"
+        title="HeaderBase test"
+      >
+        should render HeaderBase element correctly
+      </HeaderBase>,
+    );
+    expect(getByTestId('header-base')).toHaveClass('mm-header-base--test');
+  });
+
+  it('should render HeaderBase children', () => {
+    const { getByText } = render(
+      <HeaderBase>HeaderBase children test</HeaderBase>,
+    );
+    expect(getByText('HeaderBase children test')).toBeDefined();
+  });
+
+  it('should render HeaderBase startAccessory', () => {
+    const { getByTestId } = render(
+      <HeaderBase
+        startAccessory={
+          <Icon data-testid="start-accessory" name={ICON_NAMES.ADD_SQUARE} />
+        }
+      />,
+    );
+
+    expect(getByTestId('start-accessory')).toBeDefined();
+  });
+
+  it('should render HeaderBase endAccessory', () => {
+    const { getByTestId } = render(
+      <HeaderBase
+        endAccessory={
+          <Icon data-testid="end-accessory" name={ICON_NAMES.ADD_SQUARE} />
+        }
+      />,
+    );
+
+    expect(getByTestId('end-accessory')).toBeDefined();
+  });
+});
diff --git a/ui/components/component-library/header-base/header-base.tsx b/ui/components/component-library/header-base/header-base.tsx
new file mode 100644
index 000000000..220a596d4
--- /dev/null
+++ b/ui/components/component-library/header-base/header-base.tsx
@@ -0,0 +1,117 @@
+import React, { useRef, useLayoutEffect, useMemo, useState } from 'react';
+import classnames from 'classnames';
+import {
+  BLOCK_SIZES,
+  DISPLAY,
+  JustifyContent,
+} from '../../../helpers/constants/design-system';
+import Box from '../../ui/box';
+
+import { HeaderBaseProps } from './header-base.types';
+
+export const HeaderBase: React.FC<HeaderBaseProps> = ({
+  startAccessory,
+  endAccessory,
+  className = '',
+  children,
+  childrenWrapperProps,
+  startAccessoryWrapperProps,
+  endAccessoryWrapperProps,
+  ...props
+}) => {
+  const startAccessoryRef = useRef<HTMLDivElement>(null);
+  const endAccessoryRef = useRef<HTMLDivElement>(null);
+  const [accessoryMinWidth, setAccessoryMinWidth] = useState<number>();
+
+  useLayoutEffect(() => {
+    function handleResize() {
+      if (startAccessoryRef.current && endAccessoryRef.current) {
+        const accMinWidth = Math.max(
+          startAccessoryRef.current.scrollWidth,
+          endAccessoryRef.current.scrollWidth,
+        );
+        setAccessoryMinWidth(accMinWidth);
+      } else if (startAccessoryRef.current && !endAccessoryRef.current) {
+        setAccessoryMinWidth(startAccessoryRef.current.scrollWidth);
+      } else if (!startAccessoryRef.current && endAccessoryRef.current) {
+        setAccessoryMinWidth(endAccessoryRef.current.scrollWidth);
+      } else {
+        setAccessoryMinWidth(0);
+      }
+    }
+
+    handleResize();
+    window.addEventListener('resize', handleResize);
+
+    return () => {
+      window.removeEventListener('resize', handleResize);
+    };
+  }, [startAccessoryRef, endAccessoryRef, children]);
+
+  const getTitleStyles = useMemo(() => {
+    if (startAccessory && !endAccessory) {
+      return {
+        marginRight: `${accessoryMinWidth}px`,
+      };
+    } else if (!startAccessory && endAccessory) {
+      return {
+        marginLeft: `${accessoryMinWidth}px`,
+      };
+    }
+    return {};
+  }, [accessoryMinWidth, startAccessory, endAccessory]);
+
+  return (
+    <Box
+      className={classnames('mm-header-base', className)}
+      display={DISPLAY.FLEX}
+      justifyContent={JustifyContent.spaceBetween}
+      {...props}
+    >
+      {startAccessory && (
+        <Box
+          className="mm-header-base__start-accessory"
+          ref={startAccessoryRef}
+          style={
+            children
+              ? {
+                  minWidth: `${accessoryMinWidth}px`,
+                }
+              : undefined
+          }
+          {...startAccessoryWrapperProps}
+        >
+          {startAccessory}
+        </Box>
+      )}
+      {children && (
+        <Box
+          className="mm-header-base__children"
+          width={BLOCK_SIZES.FULL}
+          style={getTitleStyles}
+          {...childrenWrapperProps}
+        >
+          {children}
+        </Box>
+      )}
+      {endAccessory && (
+        <Box
+          display={DISPLAY.FLEX}
+          justifyContent={JustifyContent.flexEnd}
+          className="mm-header-base__end-accessory"
+          ref={endAccessoryRef}
+          style={
+            children
+              ? {
+                  minWidth: `${accessoryMinWidth}px`,
+                }
+              : undefined
+          }
+          {...endAccessoryWrapperProps}
+        >
+          {endAccessory}
+        </Box>
+      )}
+    </Box>
+  );
+};
diff --git a/ui/components/component-library/header-base/header-base.types.ts b/ui/components/component-library/header-base/header-base.types.ts
new file mode 100644
index 000000000..a871ce744
--- /dev/null
+++ b/ui/components/component-library/header-base/header-base.types.ts
@@ -0,0 +1,33 @@
+import React from 'react';
+import type { BoxProps } from '../../ui/box/box.d';
+
+export interface HeaderBaseProps extends BoxProps {
+  /**
+   * The children is the title area of the HeaderBase
+   */
+  children?: React.ReactNode;
+  /**
+   * Use the `childrenWrapperProps` prop to define the props to the children wrapper
+   */
+  childrenWrapperProps?: BoxProps;
+  /**
+   * The start(default left) content area of HeaderBase
+   */
+  startAccessory?: React.ReactNode;
+  /**
+   * Use the `startAccessoryWrapperProps` prop to define the props to the start accessory wrapper
+   */
+  startAccessoryWrapperProps?: BoxProps;
+  /**
+   * The end (default right) content area of HeaderBase
+   */
+  endAccessory?: React.ReactNode;
+  /**
+   * Use the `endAccessoryWrapperProps` prop to define the props to the end accessory wrapper
+   */
+  endAccessoryWrapperProps?: BoxProps;
+  /**
+   * An additional className to apply to the HeaderBase
+   */
+  className?: string;
+}
diff --git a/ui/components/component-library/header-base/index.ts b/ui/components/component-library/header-base/index.ts
new file mode 100644
index 000000000..1b47557f8
--- /dev/null
+++ b/ui/components/component-library/header-base/index.ts
@@ -0,0 +1,2 @@
+export { HeaderBase } from './header-base';
+export type { HeaderBaseProps } from './header-base.types';
diff --git a/ui/components/component-library/index.js b/ui/components/component-library/index.js
index 33e8ab604..f24721433 100644
--- a/ui/components/component-library/index.js
+++ b/ui/components/component-library/index.js
@@ -21,6 +21,7 @@ export { ButtonLink, BUTTON_LINK_SIZES } from './button-link';
 export { ButtonPrimary, BUTTON_PRIMARY_SIZES } from './button-primary';
 export { ButtonSecondary, BUTTON_SECONDARY_SIZES } from './button-secondary';
 export { FormTextField } from './form-text-field';
+export { HeaderBase } from './header-base';
 export { HelpText } from './help-text';
 export { Icon, ICON_NAMES, ICON_SIZES } from './icon';
 export { Label } from './label';

From 048c3e32583c4db3c05a9d6da9de0803e4a148e3 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Thu, 23 Mar 2023 16:52:01 +0100
Subject: [PATCH 059/129] [FLASK] Update iframe-execution-environment (#18299)

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

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 6a2c1107d..1e9698e78 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -748,7 +748,7 @@ export default class MetamaskController extends EventEmitter {
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     const snapExecutionServiceArgs = {
       iframeUrl: new URL(
-        'https://metamask.github.io/iframe-execution-environment/0.13.0',
+        'https://metamask.github.io/iframe-execution-environment/0.14.0',
       ),
       messenger: this.controllerMessenger.getRestricted({
         name: 'ExecutionService',

From 270ff26561677c173c8137be914e618261827aca Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 23 Mar 2023 09:07:28 -0700
Subject: [PATCH 060/129] Fixes to the Linea Goerli implementation (#18290)

* Ensure that NonInfuraDefaultNetworks are only selected in the dropdown if they are the currently selected network

* Ensure Linea Goerli network appears in network settings tab if added manually
---
 .../app/dropdowns/network-dropdown.js         | 21 ++++++++-----------
 .../settings/networks-tab/networks-tab.js     | 20 ++++++++++--------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/ui/components/app/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js
index 09e94c498..c40ccc79d 100644
--- a/ui/components/app/dropdowns/network-dropdown.js
+++ b/ui/components/app/dropdowns/network-dropdown.js
@@ -286,22 +286,20 @@ class NetworkDropdown extends Component {
   }
 
   renderNonInfuraDefaultNetwork(networkConfigurations, network) {
-    const {
-      provider: { type: providerType },
-      setActiveNetwork,
-      upsertNetworkConfiguration,
-    } = this.props;
+    const { provider, setActiveNetwork, upsertNetworkConfiguration } =
+      this.props;
 
-    const isCurrentRpcTarget = providerType === NETWORK_TYPES.RPC;
+    const { chainId, ticker, blockExplorerUrl } = BUILT_IN_NETWORKS[network];
+    const networkName = NETWORK_TO_NAME_MAP[network];
+    const rpcUrl = CHAIN_ID_TO_RPC_URL_MAP[chainId];
+
+    const isCurrentRpcTarget =
+      provider.type === NETWORK_TYPES.RPC && rpcUrl === provider.rpcUrl;
     return (
       <DropdownMenuItem
         key={network}
         closeMenu={this.props.hideNetworkDropdown}
         onClick={async () => {
-          const { chainId, ticker, blockExplorerUrl } =
-            BUILT_IN_NETWORKS[network];
-          const networkName = NETWORK_TO_NAME_MAP[network];
-
           const networkConfiguration = pickBy(
             networkConfigurations,
             (config) => config.rpcUrl === CHAIN_ID_TO_RPC_URL_MAP[chainId],
@@ -310,7 +308,6 @@ class NetworkDropdown extends Component {
           let configurationId = null;
           // eslint-disable-next-line no-extra-boolean-cast, no-implicit-coercion
           if (!!networkConfiguration) {
-            const rpcUrl = CHAIN_ID_TO_RPC_URL_MAP[chainId];
             configurationId = await upsertNetworkConfiguration(
               {
                 rpcUrl,
@@ -346,7 +343,7 @@ class NetworkDropdown extends Component {
           data-testid={`${network}-network-item`}
           style={{
             color:
-              providerType === network
+              provider.type === network
                 ? 'var(--color-text-default)'
                 : 'var(--color-text-alternative)',
           }}
diff --git a/ui/pages/settings/networks-tab/networks-tab.js b/ui/pages/settings/networks-tab/networks-tab.js
index bbc0443cd..7ba0e29af 100644
--- a/ui/pages/settings/networks-tab/networks-tab.js
+++ b/ui/pages/settings/networks-tab/networks-tab.js
@@ -30,11 +30,13 @@ import NetworksTabContent from './networks-tab-content';
 import NetworksForm from './networks-form';
 import NetworksFormSubheader from './networks-tab-subheader';
 
-const defaultNetworks = defaultNetworksData.map((network) => ({
-  ...network,
-  viewOnly: true,
-  isATestNetwork: TEST_CHAINS.includes(network.chainId),
-}));
+const defaultNetworks = defaultNetworksData
+  .map((network) => ({
+    ...network,
+    viewOnly: true,
+    isATestNetwork: TEST_CHAINS.includes(network.chainId),
+  }))
+  .filter((network) => network.chainId !== CHAIN_IDS.LINEA_TESTNET);
 
 const NetworksTab = ({ addNewNetwork }) => {
   const t = useI18nContext();
@@ -55,8 +57,8 @@ const NetworksTab = ({ addNewNetwork }) => {
     getNetworksTabSelectedNetworkConfigurationId,
   );
 
-  const networkConfigurationsList = Object.entries(networkConfigurations)
-    .map(([networkConfigurationId, networkConfiguration]) => {
+  const networkConfigurationsList = Object.entries(networkConfigurations).map(
+    ([networkConfigurationId, networkConfiguration]) => {
       return {
         label: networkConfiguration.nickname,
         iconColor: 'var(--color-icon-alternative)',
@@ -68,8 +70,8 @@ const NetworksTab = ({ addNewNetwork }) => {
         isATestNetwork: TEST_CHAINS.includes(networkConfiguration.chainId),
         networkConfigurationId,
       };
-    })
-    .filter((network) => network.chainId !== CHAIN_IDS.LINEA_TESTNET);
+    },
+  );
 
   let networksToRender = [...defaultNetworks, ...networkConfigurationsList];
   if (!SHOULD_SHOW_LINEA_TESTNET_NETWORK) {

From c89b93dc1dfe12176c276fd397b8c7f280b4f26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Oliv=C3=A9?= <albertolivecorbella@gmail.com>
Date: Thu, 23 Mar 2023 17:09:09 +0100
Subject: [PATCH 061/129] adding code fence in extension file (#17874)

---
 app/scripts/platforms/extension.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index faf9af160..3a298e699 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -176,9 +176,14 @@ export default class ExtensionPlatform {
   _showFailedTransaction(txMeta, errorMessage) {
     const nonce = parseInt(txMeta.txParams.nonce, 16);
     const title = 'Failed transaction';
-    const message = `Transaction ${nonce} failed! ${
+    let message = `Transaction ${nonce} failed! ${
       errorMessage || txMeta.err.message
     }`;
+    ///: BEGIN:ONLY_INCLUDE_IN(mmi)
+    if (isNaN(nonce)) {
+      message = `Transaction failed! ${errorMessage || txMeta.err.message}`;
+    }
+    ///: END:ONLY_INCLUDE_IN
     this._showNotification(title, message);
   }
 

From 196b8408d0cdf5e35e241be9f0ca98337b4acf0d Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Thu, 23 Mar 2023 09:32:54 -0700
Subject: [PATCH 062/129] PermissionsConnectHeader: unlock SiteOrigin title
 (#18270)

* PermissionsConnectHeader: unlock SiteOrigin title

* SignatureRequestOriginal: unlock SiteOrigin title

* signature-req: update snapshots
---
 .../permissions-connect-header.component.js                      | 1 +
 .../__snapshots__/signature-request-original.test.js.snap        | 1 +
 .../signature-request-original.component.js                      | 1 +
 .../__snapshots__/signature-request-siwe.test.js.snap            | 1 +
 4 files changed, 4 insertions(+)

diff --git a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
index cc8f95513..43b6d5f7e 100644
--- a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
+++ b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
@@ -64,6 +64,7 @@ export default class PermissionsConnectHeader extends Component {
         <SiteOrigin
           chip
           siteOrigin={siteOrigin}
+          title={siteOrigin}
           iconSrc={iconUrl}
           name={iconName}
           leftIcon={leftIcon}
diff --git a/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap b/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap
index 00d474e50..17b2c4670 100644
--- a/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap
+++ b/ui/components/app/signature-request-original/__snapshots__/signature-request-original.test.js.snap
@@ -182,6 +182,7 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `
       >
         <div
           class="site-origin"
+          title="https://happydapp.website/governance?futarchy=true"
         >
           <div
             class="chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined"
diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js
index 662f665d3..9d46e92d1 100644
--- a/ui/components/app/signature-request-original/signature-request-original.component.js
+++ b/ui/components/app/signature-request-original/signature-request-original.component.js
@@ -154,6 +154,7 @@ export default class SignatureRequestOriginal extends Component {
         ) : null}
         <div className="request-signature__origin">
           <SiteOrigin
+            title={txData.msgParams.origin}
             siteOrigin={txData.msgParams.origin}
             iconSrc={targetSubjectMetadata?.iconUrl}
             iconName={
diff --git a/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap b/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
index 345cfdef7..418b8dba0 100644
--- a/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
+++ b/ui/components/app/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
@@ -16,6 +16,7 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`]
         >
           <div
             class="site-origin"
+            title="https://example-dapp.website"
           >
             <div
               class="chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined"

From 0351309227181e9ab4382d7a66910bbcebfabd6b Mon Sep 17 00:00:00 2001
From: Filip Sekulic <filip.sekulic@consensys.net>
Date: Thu, 23 Mar 2023 18:01:51 +0100
Subject: [PATCH 063/129] OpenSea security provider metrics (#17688)

* Added metrics for the OpenSea security provider

* Fixed tests

* Fixed a test

* Fixed metrics

* Code refactor

* Lint fixed

* Removed unnecessary code

* Fix build

* Fix e2e

* Cleanup

* Fix e2e

* Code refactor

* Removed unnecessary code

* rpc middleware: catch securityProviderCheck errors
to not block dapp rpc requests

* Fixed an issue

* Added aditional test

* Applied some changes

* Fixed a test

* Fixed a test

* Code refactor

* Covered more code with tests

* Updated a test

* Fixed an issue

---------

Co-authored-by: Jyoti Puri <jyotipuri@gmail.com>
Co-authored-by: digiwand <20778143+digiwand@users.noreply.github.com>
Co-authored-by: Brad Decker <bhdecker84@gmail.com>
---
 app/scripts/controllers/metametrics.js        |   3 +
 app/scripts/controllers/metametrics.test.js   |   2 +
 app/scripts/controllers/transactions/index.js |  12 ++
 .../controllers/transactions/index.test.js    | 170 ++++++++++++++++++
 .../lib/createRPCMethodTrackingMiddleware.js  | 132 +++++++++++---
 .../createRPCMethodTrackingMiddleware.test.js | 122 ++++++++++++-
 app/scripts/lib/security-provider-helpers.js  |  12 +-
 app/scripts/metamask-controller.js            |   9 +-
 shared/constants/metametrics.js               |   4 +
 test/e2e/tests/eth-sign.spec.js               |   2 +-
 10 files changed, 426 insertions(+), 42 deletions(-)

diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index f9266a540..a949f3cc7 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -721,6 +721,9 @@ export default class MetaMetricsController {
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
       [TRAITS.DESKTOP_ENABLED]: metamaskState.desktopEnabled || false,
       ///: END:ONLY_INCLUDE_IN
+      [TRAITS.SECURITY_PROVIDERS]: metamaskState.transactionSecurityCheckEnabled
+        ? ['opensea']
+        : [],
     };
 
     if (!previousUserTraits) {
diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js
index 494d4f763..f3969a7b3 100644
--- a/app/scripts/controllers/metametrics.test.js
+++ b/app/scripts/controllers/metametrics.test.js
@@ -952,6 +952,7 @@ describe('MetaMetricsController', function () {
         theme: 'default',
         useTokenDetection: true,
         desktopEnabled: false,
+        security_providers: [],
       });
 
       assert.deepEqual(traits, {
@@ -970,6 +971,7 @@ describe('MetaMetricsController', function () {
         [TRAITS.THEME]: 'default',
         [TRAITS.TOKEN_DETECTION_ENABLED]: true,
         [TRAITS.DESKTOP_ENABLED]: false,
+        [TRAITS.SECURITY_PROVIDERS]: [],
       });
     });
 
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 32f405617..112071ffd 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -2147,6 +2147,7 @@ export default class TransactionController extends EventEmitter {
       originalApprovalAmount,
       finalApprovalAmount,
       contractMethodName,
+      securityProviderResponse,
     } = txMeta;
 
     const source = referrer === ORIGIN_METAMASK ? 'user' : 'dapp';
@@ -2298,6 +2299,16 @@ export default class TransactionController extends EventEmitter {
       }
     }
 
+    let uiCustomizations;
+
+    if (securityProviderResponse?.flagAsDangerous === 1) {
+      uiCustomizations = ['flagged_as_malicious'];
+    } else if (securityProviderResponse?.flagAsDangerous === 2) {
+      uiCustomizations = ['flagged_as_safety_unknown'];
+    } else {
+      uiCustomizations = null;
+    }
+
     let properties = {
       chain_id: chainId,
       referrer,
@@ -2312,6 +2323,7 @@ export default class TransactionController extends EventEmitter {
       token_standard: tokenStandard,
       transaction_type: transactionType,
       transaction_speed_up: type === TransactionType.retry,
+      ui_customizations: uiCustomizations,
     };
 
     if (transactionContractMethod === contractMethodNames.APPROVE) {
diff --git a/app/scripts/controllers/transactions/index.test.js b/app/scripts/controllers/transactions/index.test.js
index 7cf1f5a01..096783fae 100644
--- a/app/scripts/controllers/transactions/index.test.js
+++ b/app/scripts/controllers/transactions/index.test.js
@@ -1740,6 +1740,9 @@ describe('Transaction Controller', function () {
             gas: '0x7b0d',
             gasPrice: '0x77359400',
           },
+          securityProviderResponse: {
+            flagAsDangerous: 0,
+          },
         };
       });
 
@@ -1766,6 +1769,7 @@ describe('Transaction Controller', function () {
             token_standard: TokenStandard.none,
             device_model: 'N/A',
             transaction_speed_up: false,
+            ui_customizations: null,
           },
           sensitiveProperties: {
             default_gas: '0.000031501',
@@ -1852,6 +1856,7 @@ describe('Transaction Controller', function () {
             token_standard: TokenStandard.none,
             device_model: 'N/A',
             transaction_speed_up: false,
+            ui_customizations: null,
           },
           sensitiveProperties: {
             default_gas: '0.000031501',
@@ -1921,6 +1926,9 @@ describe('Transaction Controller', function () {
             gas: '0x7b0d',
             gasPrice: '0x77359400',
           },
+          securityProviderResponse: {
+            flagAsDangerous: 0,
+          },
         };
       });
 
@@ -1947,6 +1955,7 @@ describe('Transaction Controller', function () {
             token_standard: TokenStandard.none,
             device_model: 'N/A',
             transaction_speed_up: false,
+            ui_customizations: null,
           },
           sensitiveProperties: {
             default_gas: '0.000031501',
@@ -2035,6 +2044,7 @@ describe('Transaction Controller', function () {
             token_standard: TokenStandard.none,
             device_model: 'N/A',
             transaction_speed_up: false,
+            ui_customizations: null,
           },
           sensitiveProperties: {
             default_gas: '0.000031501',
@@ -2099,6 +2109,9 @@ describe('Transaction Controller', function () {
         chainId: currentChainId,
         time: 1624408066355,
         metamaskNetworkId: currentNetworkId,
+        securityProviderResponse: {
+          flagAsDangerous: 0,
+        },
       };
 
       const expectedPayload = {
@@ -2122,6 +2135,7 @@ describe('Transaction Controller', function () {
           token_standard: TokenStandard.none,
           device_model: 'N/A',
           transaction_speed_up: false,
+          ui_customizations: null,
         },
         sensitiveProperties: {
           gas_price: '2',
@@ -2167,6 +2181,9 @@ describe('Transaction Controller', function () {
         chainId: currentChainId,
         time: 1624408066355,
         metamaskNetworkId: currentNetworkId,
+        securityProviderResponse: {
+          flagAsDangerous: 0,
+        },
       };
       const expectedPayload = {
         actionId,
@@ -2190,6 +2207,155 @@ describe('Transaction Controller', function () {
           token_standard: TokenStandard.none,
           device_model: 'N/A',
           transaction_speed_up: false,
+          ui_customizations: null,
+        },
+        sensitiveProperties: {
+          baz: 3.0,
+          foo: 'bar',
+          gas_price: '2',
+          gas_limit: '0x7b0d',
+          transaction_contract_method: undefined,
+          transaction_replaced: undefined,
+          first_seen: 1624408066355,
+          transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
+          status: 'unapproved',
+        },
+      };
+
+      await txController._trackTransactionMetricsEvent(
+        txMeta,
+        TransactionMetaMetricsEvent.added,
+        actionId,
+        {
+          baz: 3.0,
+          foo: 'bar',
+        },
+      );
+      assert.equal(createEventFragmentSpy.callCount, 1);
+      assert.equal(finalizeEventFragmentSpy.callCount, 0);
+      assert.deepEqual(
+        createEventFragmentSpy.getCall(0).args[0],
+        expectedPayload,
+      );
+    });
+
+    it('should call _trackMetaMetricsEvent with the correct payload (extra params) when flagAsDangerous is malicious', async function () {
+      const txMeta = {
+        id: 1,
+        status: TransactionStatus.unapproved,
+        txParams: {
+          from: fromAccount.address,
+          to: '0x1678a085c290ebd122dc42cba69373b5953b831d',
+          gasPrice: '0x77359400',
+          gas: '0x7b0d',
+          nonce: '0x4b',
+        },
+        type: TransactionType.simpleSend,
+        origin: 'other',
+        chainId: currentChainId,
+        time: 1624408066355,
+        metamaskNetworkId: currentNetworkId,
+        securityProviderResponse: {
+          flagAsDangerous: 1,
+        },
+      };
+      const expectedPayload = {
+        actionId,
+        initialEvent: 'Transaction Added',
+        successEvent: 'Transaction Approved',
+        failureEvent: 'Transaction Rejected',
+        uniqueIdentifier: 'transaction-added-1',
+        persist: true,
+        category: EVENT.CATEGORIES.TRANSACTIONS,
+        properties: {
+          network: '5',
+          referrer: 'other',
+          source: EVENT.SOURCE.TRANSACTION.DAPP,
+          transaction_type: TransactionType.simpleSend,
+          chain_id: '0x5',
+          eip_1559_version: '0',
+          gas_edit_attempted: 'none',
+          gas_edit_type: 'none',
+          account_type: 'MetaMask',
+          asset_type: AssetType.native,
+          token_standard: TokenStandard.none,
+          device_model: 'N/A',
+          transaction_speed_up: false,
+          ui_customizations: ['flagged_as_malicious'],
+        },
+        sensitiveProperties: {
+          baz: 3.0,
+          foo: 'bar',
+          gas_price: '2',
+          gas_limit: '0x7b0d',
+          transaction_contract_method: undefined,
+          transaction_replaced: undefined,
+          first_seen: 1624408066355,
+          transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
+          status: 'unapproved',
+        },
+      };
+
+      await txController._trackTransactionMetricsEvent(
+        txMeta,
+        TransactionMetaMetricsEvent.added,
+        actionId,
+        {
+          baz: 3.0,
+          foo: 'bar',
+        },
+      );
+      assert.equal(createEventFragmentSpy.callCount, 1);
+      assert.equal(finalizeEventFragmentSpy.callCount, 0);
+      assert.deepEqual(
+        createEventFragmentSpy.getCall(0).args[0],
+        expectedPayload,
+      );
+    });
+
+    it('should call _trackMetaMetricsEvent with the correct payload (extra params) when flagAsDangerous is unknown', async function () {
+      const txMeta = {
+        id: 1,
+        status: TransactionStatus.unapproved,
+        txParams: {
+          from: fromAccount.address,
+          to: '0x1678a085c290ebd122dc42cba69373b5953b831d',
+          gasPrice: '0x77359400',
+          gas: '0x7b0d',
+          nonce: '0x4b',
+        },
+        type: TransactionType.simpleSend,
+        origin: 'other',
+        chainId: currentChainId,
+        time: 1624408066355,
+        metamaskNetworkId: currentNetworkId,
+        securityProviderResponse: {
+          flagAsDangerous: 2,
+        },
+      };
+      const expectedPayload = {
+        actionId,
+        initialEvent: 'Transaction Added',
+        successEvent: 'Transaction Approved',
+        failureEvent: 'Transaction Rejected',
+        uniqueIdentifier: 'transaction-added-1',
+        persist: true,
+        category: EVENT.CATEGORIES.TRANSACTIONS,
+        properties: {
+          network: '5',
+          referrer: 'other',
+          source: EVENT.SOURCE.TRANSACTION.DAPP,
+          transaction_type: TransactionType.simpleSend,
+          chain_id: '0x5',
+          eip_1559_version: '0',
+          gas_edit_attempted: 'none',
+          gas_edit_type: 'none',
+          account_type: 'MetaMask',
+          asset_type: AssetType.native,
+          token_standard: TokenStandard.none,
+          device_model: 'N/A',
+          transaction_speed_up: false,
+          ui_customizations: ['flagged_as_safety_unknown'],
         },
         sensitiveProperties: {
           baz: 3.0,
@@ -2245,6 +2411,9 @@ describe('Transaction Controller', function () {
           maxFeePerGas: '0x77359400',
           maxPriorityFeePerGas: '0x77359400',
         },
+        securityProviderResponse: {
+          flagAsDangerous: 0,
+        },
       };
       const expectedPayload = {
         actionId,
@@ -2268,6 +2437,7 @@ describe('Transaction Controller', function () {
           token_standard: TokenStandard.none,
           device_model: 'N/A',
           transaction_speed_up: false,
+          ui_customizations: null,
         },
         sensitiveProperties: {
           baz: 3.0,
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
index e1376ae1e..8a5186d42 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -107,14 +107,16 @@ const rateLimitTimeouts = {};
  *  MetaMetricsController
  * @param {number} [opts.rateLimitSeconds] - number of seconds to wait before
  *  allowing another set of events to be tracked.
+ * @param opts.securityProviderRequest
  * @returns {Function}
  */
 export default function createRPCMethodTrackingMiddleware({
   trackEvent,
   getMetricsState,
   rateLimitSeconds = 60 * 5,
+  securityProviderRequest,
 }) {
-  return function rpcMethodTrackingMiddleware(
+  return async function rpcMethodTrackingMiddleware(
     /** @type {any} */ req,
     /** @type {any} */ res,
     /** @type {Function} */ next,
@@ -162,22 +164,65 @@ export default function createRPCMethodTrackingMiddleware({
 
       const properties = {};
 
+      let msgParams;
+
       if (event === EVENT_NAMES.SIGNATURE_REQUESTED) {
         properties.signature_type = method;
+
+        const data = req?.params?.[0];
+        const from = req?.params?.[1];
+        const paramsExamplePassword = req?.params?.[2];
+
+        msgParams = {
+          ...paramsExamplePassword,
+          from,
+          data,
+          origin,
+        };
+
+        const msgData = {
+          msgParams,
+          status: 'unapproved',
+          type: req.method,
+        };
+
+        try {
+          const securityProviderResponse = await securityProviderRequest(
+            msgData,
+            req.method,
+          );
+
+          if (securityProviderResponse?.flagAsDangerous === 1) {
+            properties.ui_customizations = ['flagged_as_malicious'];
+          } else if (securityProviderResponse?.flagAsDangerous === 2) {
+            properties.ui_customizations = ['flagged_as_safety_unknown'];
+          } else {
+            properties.ui_customizations = null;
+          }
+
+          if (method === MESSAGE_TYPE.PERSONAL_SIGN) {
+            const { isSIWEMessage } = detectSIWE({ data });
+            if (isSIWEMessage) {
+              properties.ui_customizations === null
+                ? (properties.ui_customizations = [
+                    METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS]
+                      .SIWE,
+                  ])
+                : properties.ui_customizations.push(
+                    METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS]
+                      .SIWE,
+                  );
+            }
+          }
+        } catch (e) {
+          console.warn(
+            `createRPCMethodTrackingMiddleware: Error calling securityProviderRequest - ${e}`,
+          );
+        }
       } else {
         properties.method = method;
       }
 
-      if (method === MESSAGE_TYPE.PERSONAL_SIGN) {
-        const data = req?.params?.[0];
-        const { isSIWEMessage } = detectSIWE({ data });
-        if (isSIWEMessage) {
-          properties.ui_customizations = [
-            METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS].SIWE,
-          ];
-        }
-      }
-
       trackEvent({
         event,
         category: EVENT.CATEGORIES.INPAGE_PROVIDER,
@@ -192,7 +237,7 @@ export default function createRPCMethodTrackingMiddleware({
       }, SECOND * rateLimitSeconds);
     }
 
-    next((callback) => {
+    next(async (callback) => {
       if (shouldTrackEvent === false || typeof eventType === 'undefined') {
         return callback();
       }
@@ -216,22 +261,65 @@ export default function createRPCMethodTrackingMiddleware({
         event = eventType.APPROVED;
       }
 
+      let msgParams;
+
       if (eventType.REQUESTED === EVENT_NAMES.SIGNATURE_REQUESTED) {
         properties.signature_type = method;
+
+        const data = req?.params?.[0];
+        const from = req?.params?.[1];
+        const paramsExamplePassword = req?.params?.[2];
+
+        msgParams = {
+          ...paramsExamplePassword,
+          from,
+          data,
+          origin,
+        };
+
+        const msgData = {
+          msgParams,
+          status: 'unapproved',
+          type: req.method,
+        };
+
+        try {
+          const securityProviderResponse = await securityProviderRequest(
+            msgData,
+            req.method,
+          );
+
+          if (securityProviderResponse?.flagAsDangerous === 1) {
+            properties.ui_customizations = ['flagged_as_malicious'];
+          } else if (securityProviderResponse?.flagAsDangerous === 2) {
+            properties.ui_customizations = ['flagged_as_safety_unknown'];
+          } else {
+            properties.ui_customizations = null;
+          }
+
+          if (method === MESSAGE_TYPE.PERSONAL_SIGN) {
+            const { isSIWEMessage } = detectSIWE({ data });
+            if (isSIWEMessage) {
+              properties.ui_customizations === null
+                ? (properties.ui_customizations = [
+                    METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS]
+                      .SIWE,
+                  ])
+                : properties.ui_customizations.push(
+                    METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS]
+                      .SIWE,
+                  );
+            }
+          }
+        } catch (e) {
+          console.warn(
+            `createRPCMethodTrackingMiddleware: Error calling securityProviderRequest - ${e}`,
+          );
+        }
       } else {
         properties.method = method;
       }
 
-      if (method === MESSAGE_TYPE.PERSONAL_SIGN) {
-        const data = req?.params?.[0];
-        const { isSIWEMessage } = detectSIWE({ data });
-        if (isSIWEMessage) {
-          properties.ui_customizations = [
-            METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS].SIWE,
-          ];
-        }
-      }
-
       trackEvent({
         event,
         category: EVENT.CATEGORIES.INPAGE_PROVIDER,
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
index 9a9f72157..af910279e 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
@@ -8,10 +8,19 @@ const trackEvent = jest.fn();
 const metricsState = { participateInMetaMetrics: null };
 const getMetricsState = () => metricsState;
 
+let flagAsDangerous = 0;
+
+const securityProviderRequest = () => {
+  return {
+    flagAsDangerous,
+  };
+};
+
 const handler = createRPCMethodTrackingMiddleware({
   trackEvent,
   getMetricsState,
   rateLimitSeconds: 1,
+  securityProviderRequest,
 });
 
 function getNext(timeout = 500) {
@@ -92,7 +101,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       metricsState.participateInMetaMetrics = true;
     });
 
-    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event`, () => {
+    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event`, async () => {
       const req = {
         method: MESSAGE_TYPE.ETH_SIGN,
         origin: 'some.dapp',
@@ -102,12 +111,14 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: null,
       };
       const { next } = getNext();
-      handler(req, res, next);
+      await handler(req, res, next);
       expect(trackEvent).toHaveBeenCalledTimes(1);
       expect(trackEvent.mock.calls[0][0]).toMatchObject({
         category: 'inpage_provider',
         event: EVENT_NAMES.SIGNATURE_REQUESTED,
-        properties: { signature_type: MESSAGE_TYPE.ETH_SIGN },
+        properties: {
+          signature_type: MESSAGE_TYPE.ETH_SIGN,
+        },
         referrer: { url: 'some.dapp' },
       });
     });
@@ -122,13 +133,15 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: null,
       };
       const { next, executeMiddlewareStack } = getNext();
-      handler(req, res, next);
+      await handler(req, res, next);
       await executeMiddlewareStack();
       expect(trackEvent).toHaveBeenCalledTimes(2);
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
         category: 'inpage_provider',
         event: EVENT_NAMES.SIGNATURE_APPROVED,
-        properties: { signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4 },
+        properties: {
+          signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
+        },
         referrer: { url: 'some.dapp' },
       });
     });
@@ -143,13 +156,15 @@ describe('createRPCMethodTrackingMiddleware', () => {
         error: { code: 4001 },
       };
       const { next, executeMiddlewareStack } = getNext();
-      handler(req, res, next);
+      await handler(req, res, next);
       await executeMiddlewareStack();
       expect(trackEvent).toHaveBeenCalledTimes(2);
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
         category: 'inpage_provider',
         event: EVENT_NAMES.SIGNATURE_REJECTED,
-        properties: { signature_type: MESSAGE_TYPE.PERSONAL_SIGN },
+        properties: {
+          signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
+        },
         referrer: { url: 'some.dapp' },
       });
     });
@@ -162,7 +177,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
 
       const res = {};
       const { next, executeMiddlewareStack } = getNext();
-      handler(req, res, next);
+      await handler(req, res, next);
       await executeMiddlewareStack();
       expect(trackEvent).toHaveBeenCalledTimes(2);
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
@@ -227,7 +242,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         };
         const { next, executeMiddlewareStack } = getNext();
 
-        handler(req, res, next);
+        await handler(req, res, next);
         await executeMiddlewareStack();
 
         expect(trackEvent).toHaveBeenCalledTimes(2);
@@ -244,4 +259,93 @@ describe('createRPCMethodTrackingMiddleware', () => {
       });
     });
   });
+
+  describe('participateInMetaMetrics is set to true with a request flagged as safe', () => {
+    beforeEach(() => {
+      metricsState.participateInMetaMetrics = true;
+    });
+
+    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as safe`, async () => {
+      const req = {
+        method: MESSAGE_TYPE.ETH_SIGN,
+        origin: 'some.dapp',
+      };
+
+      const res = {
+        error: null,
+      };
+      const { next } = getNext();
+      await handler(req, res, next);
+      expect(trackEvent).toHaveBeenCalledTimes(1);
+      expect(trackEvent.mock.calls[0][0]).toMatchObject({
+        category: 'inpage_provider',
+        event: EVENT_NAMES.SIGNATURE_REQUESTED,
+        properties: {
+          signature_type: MESSAGE_TYPE.ETH_SIGN,
+          ui_customizations: null,
+        },
+        referrer: { url: 'some.dapp' },
+      });
+    });
+  });
+
+  describe('participateInMetaMetrics is set to true with a request flagged as malicious', () => {
+    beforeEach(() => {
+      metricsState.participateInMetaMetrics = true;
+      flagAsDangerous = 1;
+    });
+
+    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as malicious`, async () => {
+      const req = {
+        method: MESSAGE_TYPE.ETH_SIGN,
+        origin: 'some.dapp',
+      };
+
+      const res = {
+        error: null,
+      };
+      const { next } = getNext();
+      await handler(req, res, next);
+      expect(trackEvent).toHaveBeenCalledTimes(1);
+      expect(trackEvent.mock.calls[0][0]).toMatchObject({
+        category: 'inpage_provider',
+        event: EVENT_NAMES.SIGNATURE_REQUESTED,
+        properties: {
+          signature_type: MESSAGE_TYPE.ETH_SIGN,
+          ui_customizations: ['flagged_as_malicious'],
+        },
+        referrer: { url: 'some.dapp' },
+      });
+    });
+  });
+
+  describe('participateInMetaMetrics is set to true with a request flagged as safety unknown', () => {
+    beforeEach(() => {
+      metricsState.participateInMetaMetrics = true;
+      flagAsDangerous = 2;
+    });
+
+    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as safety unknown`, async () => {
+      const req = {
+        method: MESSAGE_TYPE.ETH_SIGN,
+        origin: 'some.dapp',
+      };
+
+      const res = {
+        error: null,
+      };
+      const { next } = getNext();
+      await handler(req, res, next);
+      expect(trackEvent).toHaveBeenCalledTimes(1);
+      expect(trackEvent.mock.calls[0][0]).toMatchObject({
+        category: 'inpage_provider',
+        event: EVENT_NAMES.SIGNATURE_REQUESTED,
+        properties: {
+          signature_type: MESSAGE_TYPE.ETH_SIGN,
+          ui_customizations: ['flagged_as_safety_unknown'],
+        },
+        referrer: { url: 'some.dapp' },
+      });
+    });
+  });
 });
diff --git a/app/scripts/lib/security-provider-helpers.js b/app/scripts/lib/security-provider-helpers.js
index db66c462d..b05c9a40b 100644
--- a/app/scripts/lib/security-provider-helpers.js
+++ b/app/scripts/lib/security-provider-helpers.js
@@ -39,12 +39,12 @@ export async function securityProviderCheck(
       rpc_method_name: methodName,
       chain_id: chainId,
       data: {
-        from_address: requestData.txParams.from,
-        to_address: requestData.txParams.to,
-        gas: requestData.txParams.gas,
-        gasPrice: requestData.txParams.gasPrice,
-        value: requestData.txParams.value,
-        data: requestData.txParams.data,
+        from_address: requestData?.txParams?.from,
+        to_address: requestData?.txParams?.to,
+        gas: requestData?.txParams?.gas,
+        gasPrice: requestData?.txParams?.gasPrice,
+        value: requestData?.txParams?.value,
+        data: requestData?.txParams?.data,
       },
       currentLocale,
     };
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 1e9698e78..b4c2ef4ba 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3729,6 +3729,7 @@ export default class MetamaskController extends EventEmitter {
         getMetricsState: this.metaMetricsController.store.getState.bind(
           this.metaMetricsController.store,
         ),
+        securityProviderRequest: this.securityProviderRequest.bind(this),
       }),
     );
 
@@ -4383,11 +4384,11 @@ export default class MetamaskController extends EventEmitter {
     const { currentLocale, transactionSecurityCheckEnabled } =
       this.preferencesController.store.getState();
 
-    const chainId = Number(
-      hexToDecimal(this.networkController.store.getState().provider.chainId),
-    );
-
     if (transactionSecurityCheckEnabled) {
+      const chainId = Number(
+        hexToDecimal(this.networkController.store.getState().provider.chainId),
+      );
+
       try {
         const securityProviderResponse = await securityProviderCheck(
           requestData,
diff --git a/shared/constants/metametrics.js b/shared/constants/metametrics.js
index 853807ce5..a9691d5a2 100644
--- a/shared/constants/metametrics.js
+++ b/shared/constants/metametrics.js
@@ -187,6 +187,8 @@
  * identify the token_detection_enabled trait
  * @property {'install_date_ext'} INSTALL_DATE_EXT - when the user installed the extension
  * @property {'desktop_enabled'} [DESKTOP_ENABLED] - optional / does the user have desktop enabled?
+ * @property {'security_providers'} SECURITY_PROVIDERS - when security provider feature is toggled we
+ * identify the security_providers trait
  */
 
 /**
@@ -210,6 +212,7 @@ export const TRAITS = {
   THREE_BOX_ENABLED: 'three_box_enabled',
   TOKEN_DETECTION_ENABLED: 'token_detection_enabled',
   DESKTOP_ENABLED: 'desktop_enabled',
+  SECURITY_PROVIDERS: 'security_providers',
 };
 
 /**
@@ -240,6 +243,7 @@ export const TRAITS = {
  * @property {string} [theme] - which theme the user has selected
  * @property {boolean} [token_detection_enabled] - does the user have token detection is enabled?
  * @property {boolean} [desktop_enabled] - optional / does the user have desktop enabled?
+ * @property {Array<string>} [security_providers] - whether security provider feature toggle is on or off
  */
 
 // Mixpanel converts the zero address value to a truly anonymous event, which
diff --git a/test/e2e/tests/eth-sign.spec.js b/test/e2e/tests/eth-sign.spec.js
index 51ef2168c..5b0feb3b3 100644
--- a/test/e2e/tests/eth-sign.spec.js
+++ b/test/e2e/tests/eth-sign.spec.js
@@ -31,10 +31,10 @@ describe('Eth sign', function () {
         await driver.openNewPage('http://127.0.0.1:8080/');
         await driver.clickElement('#ethSign');
 
+        await driver.delay(1000);
         const ethSignButton = await driver.findElement('#ethSign');
         const exceptionString =
           'ERROR: ETH_SIGN HAS BEEN DISABLED. YOU MUST ENABLE IT IN THE ADVANCED SETTINGS';
-
         assert.equal(await ethSignButton.getText(), exceptionString);
       },
     );

From 2fc0d9378902fe7c3abf7393a443b82cff067f84 Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Thu, 23 Mar 2023 10:24:10 -0700
Subject: [PATCH 064/129] Disable Bridge button on unsupported networks
 (#18268)

---
 shared/constants/bridge.ts                    | 10 ++++
 .../app/wallet-overview/eth-overview.js       | 43 +++++++++++------
 .../app/wallet-overview/eth-overview.test.js  | 46 +++++++++++++++++--
 ui/components/ui/icon-button/icon-button.scss |  1 +
 ui/selectors/selectors.js                     |  7 +++
 ui/selectors/selectors.test.js                | 10 ++++
 6 files changed, 101 insertions(+), 16 deletions(-)
 create mode 100644 shared/constants/bridge.ts

diff --git a/shared/constants/bridge.ts b/shared/constants/bridge.ts
new file mode 100644
index 000000000..a70c0a62a
--- /dev/null
+++ b/shared/constants/bridge.ts
@@ -0,0 +1,10 @@
+import { CHAIN_IDS } from './network';
+
+export const ALLOWED_BRIDGE_CHAIN_IDS = [
+  CHAIN_IDS.MAINNET,
+  CHAIN_IDS.BSC,
+  CHAIN_IDS.POLYGON,
+  CHAIN_IDS.AVALANCHE,
+  CHAIN_IDS.OPTIMISM,
+  CHAIN_IDS.ARBITRUM,
+];
diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js
index a02c8459d..12e69b59b 100644
--- a/ui/components/app/wallet-overview/eth-overview.js
+++ b/ui/components/app/wallet-overview/eth-overview.js
@@ -19,6 +19,7 @@ import {
   getCurrentKeyring,
   getSwapsDefaultToken,
   getIsSwapsChain,
+  getIsBridgeChain,
   getIsBuyableChain,
   getNativeCurrencyImage,
   getSelectedAccountCachedBalance,
@@ -56,6 +57,7 @@ const EthOverview = ({ className }) => {
   const showFiat = useSelector(getShouldShowFiat);
   const balance = useSelector(getSelectedAccountCachedBalance);
   const isSwapsChain = useSelector(getIsSwapsChain);
+  const isBridgeChain = useSelector(getIsBridgeChain);
   const isBuyableChain = useSelector(getIsBuyableChain);
   const primaryTokenImage = useSelector(getNativeCurrencyImage);
   const defaultSwapsToken = useSelector(getSwapsDefaultToken);
@@ -232,26 +234,41 @@ const EthOverview = ({ className }) => {
           />
           <IconButton
             className="eth-overview__button"
+            disabled={!isBridgeChain}
             data-testid="eth-overview-bridge"
             Icon={
               <Icon name={ICON_NAMES.BRIDGE} color={IconColor.primaryInverse} />
             }
             label={t('bridge')}
             onClick={() => {
-              const portfolioUrl = process.env.PORTFOLIO_URL;
-              const bridgeUrl = `${portfolioUrl}/bridge`;
-              global.platform.openTab({
-                url: `${bridgeUrl}?metamaskEntry=ext`,
-              });
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: EVENT_NAMES.BRIDGE_LINK_CLICKED,
-                properties: {
-                  location: 'Home',
-                  text: 'Bridge',
-                },
-              });
+              if (isBridgeChain) {
+                const portfolioUrl = process.env.PORTFOLIO_URL;
+                const bridgeUrl = `${portfolioUrl}/bridge`;
+                global.platform.openTab({
+                  url: `${bridgeUrl}?metamaskEntry=ext`,
+                });
+                trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: EVENT_NAMES.BRIDGE_LINK_CLICKED,
+                  properties: {
+                    location: 'Home',
+                    text: 'Bridge',
+                  },
+                });
+              }
             }}
+            tooltipRender={
+              isBridgeChain
+                ? null
+                : (contents) => (
+                    <Tooltip
+                      title={t('currentlyUnavailable')}
+                      position="bottom"
+                    >
+                      {contents}
+                    </Tooltip>
+                  )
+            }
           />
         </>
       }
diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js
index c73377199..3d4f459c1 100644
--- a/ui/components/app/wallet-overview/eth-overview.test.js
+++ b/ui/components/app/wallet-overview/eth-overview.test.js
@@ -145,13 +145,30 @@ describe('EthOverview', () => {
       expect(secondaryBalance).toHaveTextContent('0');
     });
 
-    it('should always show the Bridge button', () => {
-      const { queryByTestId } = renderWithProvider(<EthOverview />, store);
+    it('should have the Bridge button enabled if chain id is part of supported chains', () => {
+      const mockedAvalancheStore = {
+        ...mockStore,
+        metamask: {
+          ...mockStore.metamask,
+          provider: { ...mockStore.metamask.provider, chainId: '0xa86a' },
+        },
+      };
+      const mockedStore = configureMockStore([thunk])(mockedAvalancheStore);
+
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <EthOverview />,
+        mockedStore,
+      );
       const bridgeButton = queryByTestId(ETH_OVERVIEW_BRIDGE);
       expect(bridgeButton).toBeInTheDocument();
+      expect(bridgeButton).toBeEnabled();
+      expect(queryByText('Bridge').parentElement).not.toHaveAttribute(
+        'data-original-title',
+        'Unavailable on this network',
+      );
     });
 
-    it('should open the Bridge URI when clicking on Bridge button', async () => {
+    it('should open the Bridge URI when clicking on Bridge button on supported network', async () => {
       const { queryByTestId } = renderWithProvider(<EthOverview />, store);
 
       const bridgeButton = queryByTestId(ETH_OVERVIEW_BRIDGE);
@@ -169,6 +186,29 @@ describe('EthOverview', () => {
       );
     });
 
+    it('should have the Bridge button disabled if chain id is not part of supported chains', () => {
+      const mockedFantomStore = {
+        ...mockStore,
+        metamask: {
+          ...mockStore.metamask,
+          provider: { ...mockStore.metamask.provider, chainId: '0xfa' },
+        },
+      };
+      const mockedStore = configureMockStore([thunk])(mockedFantomStore);
+
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <EthOverview />,
+        mockedStore,
+      );
+      const bridgeButton = queryByTestId(ETH_OVERVIEW_BRIDGE);
+      expect(bridgeButton).toBeInTheDocument();
+      expect(bridgeButton).toBeDisabled();
+      expect(queryByText('Bridge').parentElement).toHaveAttribute(
+        'data-original-title',
+        'Unavailable on this network',
+      );
+    });
+
     it('should always show the Portfolio button', () => {
       const { queryByTestId } = renderWithProvider(<EthOverview />, store);
       const portfolioButton = queryByTestId(ETH_OVERVIEW_PORTFOLIO);
diff --git a/ui/components/ui/icon-button/icon-button.scss b/ui/components/ui/icon-button/icon-button.scss
index 4ce70027c..8769d532c 100644
--- a/ui/components/ui/icon-button/icon-button.scss
+++ b/ui/components/ui/icon-button/icon-button.scss
@@ -22,6 +22,7 @@
     border-radius: 18px;
     margin-top: 6px;
     margin-bottom: 5px;
+    margin-inline: auto;
   }
 
   &--disabled {
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index dea043e15..425107475 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -41,6 +41,8 @@ import {
   ALLOWED_DEV_SWAPS_CHAIN_IDS,
 } from '../../shared/constants/swaps';
 
+import { ALLOWED_BRIDGE_CHAIN_IDS } from '../../shared/constants/bridge';
+
 import {
   shortenAddress,
   getAccountByAddress,
@@ -750,6 +752,11 @@ export function getIsSwapsChain(state) {
     : ALLOWED_DEV_SWAPS_CHAIN_IDS.includes(chainId);
 }
 
+export function getIsBridgeChain(state) {
+  const chainId = getCurrentChainId(state);
+  return ALLOWED_BRIDGE_CHAIN_IDS.includes(chainId);
+}
+
 export function getIsBuyableChain(state) {
   const chainId = getCurrentChainId(state);
   return Object.keys(BUYABLE_CHAINS_MAP).includes(chainId);
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index f3593f937..f1f7bfe5e 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -390,4 +390,14 @@ describe('Selectors', () => {
     const isDesktopEnabled = selectors.getIsDesktopEnabled(mockState);
     expect(isDesktopEnabled).toBeFalsy();
   });
+
+  it('#getIsBridgeChain', () => {
+    mockState.metamask.provider.chainId = '0xa';
+    const isOptimismSupported = selectors.getIsBridgeChain(mockState);
+    expect(isOptimismSupported).toBeTruthy();
+
+    mockState.metamask.provider.chainId = '0xfa';
+    const isFantomSupported = selectors.getIsBridgeChain(mockState);
+    expect(isFantomSupported).toBeFalsy();
+  });
 });

From 5dee7904d6c2efd7763afda844b1fca5072c6216 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 23 Mar 2023 22:21:33 +0400
Subject: [PATCH 065/129] Extracting out title component from
 confirm-transaction-base (#17991)

---
 test/e2e/metamask-ui.spec.js                  | 18 ++---
 ...onfirm-page-container-content.component.js |  9 ---
 ...onfirm-page-container-summary.component.js | 29 +------
 .../confirm-page-container-summary/index.scss | 25 ------
 .../confirm-page-container.component.js       |  9 ---
 ui/components/app/confirm-subtitle/README.mdx | 10 +++
 .../app/confirm-subtitle/confirm-subtitle.js  | 56 +++++++++++++
 .../confirm-subtitle.stories.js               | 51 ++++++++++++
 .../confirm-subtitle/confirm-subtitle.test.js | 80 +++++++++++++++++++
 ui/components/app/confirm-subtitle/index.js   |  1 +
 ui/components/app/confirm-title/README.mdx    | 10 +++
 .../app/confirm-title/confirm-title.js        | 68 ++++++++++++++++
 .../confirm-title/confirm-title.stories.js    | 54 +++++++++++++
 .../app/confirm-title/confirm-title.test.js   | 54 +++++++++++++
 ui/components/app/confirm-title/index.js      |  1 +
 ui/hooks/useTransactionInfo.js                | 19 +++++
 ui/hooks/useTransactionInfo.test.js           | 36 +++++++++
 .../confirm-transaction-base.test.js.snap     |  2 +-
 .../confirm-transaction-base.component.js     | 41 +++-------
 .../confirm-transaction-base.container.js     | 10 ---
 20 files changed, 463 insertions(+), 120 deletions(-)
 create mode 100644 ui/components/app/confirm-subtitle/README.mdx
 create mode 100644 ui/components/app/confirm-subtitle/confirm-subtitle.js
 create mode 100644 ui/components/app/confirm-subtitle/confirm-subtitle.stories.js
 create mode 100644 ui/components/app/confirm-subtitle/confirm-subtitle.test.js
 create mode 100644 ui/components/app/confirm-subtitle/index.js
 create mode 100644 ui/components/app/confirm-title/README.mdx
 create mode 100644 ui/components/app/confirm-title/confirm-title.js
 create mode 100644 ui/components/app/confirm-title/confirm-title.stories.js
 create mode 100644 ui/components/app/confirm-title/confirm-title.test.js
 create mode 100644 ui/components/app/confirm-title/index.js
 create mode 100644 ui/hooks/useTransactionInfo.js
 create mode 100644 ui/hooks/useTransactionInfo.test.js

diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index c1fa2a4a1..6f3754bd8 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -313,11 +313,10 @@ describe('MetaMask', function () {
         text: 'Transfer',
       });
 
-      const tokenAmount = await driver.findElement(
-        '.confirm-page-container-summary__title-text',
-      );
-      const tokenAmountText = await tokenAmount.getText();
-      assert.equal(tokenAmountText, '1 TST');
+      await driver.findElement({
+        tag: 'h1',
+        text: '1 TST',
+      });
 
       await driver.waitForSelector({
         tag: 'p',
@@ -419,11 +418,10 @@ describe('MetaMask', function () {
     });
 
     it('submits the transaction', async function () {
-      const tokenAmount = await driver.findElement(
-        '.confirm-page-container-summary__title-text',
-      );
-      const tokenAmountText = await tokenAmount.getText();
-      assert.equal(tokenAmountText, '1.5 TST');
+      await driver.findElement({
+        tag: 'h1',
+        text: '1.5 TST',
+      });
 
       await driver.clickElement({ text: 'Confirm', tag: 'button' });
       await driver.delay(regularDelayMs);
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
index 9ac822f59..c10bb8c06 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
@@ -29,11 +29,9 @@ export default class ConfirmPageContainerContent extends Component {
     ///: END:ONLY_INCLUDE_IN
     errorKey: PropTypes.string,
     errorMessage: PropTypes.string,
-    hideSubtitle: PropTypes.bool,
     tokenAddress: PropTypes.string,
     nonce: PropTypes.string,
     subtitleComponent: PropTypes.node,
-    title: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     image: PropTypes.string,
     titleComponent: PropTypes.node,
     warning: PropTypes.string,
@@ -48,7 +46,6 @@ export default class ConfirmPageContainerContent extends Component {
     disabled: PropTypes.bool,
     unapprovedTxCount: PropTypes.number,
     rejectNText: PropTypes.string,
-    hideTitle: PropTypes.bool,
     supportsEIP1559: PropTypes.bool,
     hasTopBorder: PropTypes.bool,
     nativeCurrency: PropTypes.string,
@@ -136,11 +133,9 @@ export default class ConfirmPageContainerContent extends Component {
       action,
       errorKey,
       errorMessage,
-      title,
       image,
       titleComponent,
       subtitleComponent,
-      hideSubtitle,
       tokenAddress,
       nonce,
       detailsComponent,
@@ -156,7 +151,6 @@ export default class ConfirmPageContainerContent extends Component {
       rejectNText,
       origin,
       ethGasPriceWarning,
-      hideTitle,
       supportsEIP1559,
       hasTopBorder,
       nativeCurrency,
@@ -199,15 +193,12 @@ export default class ConfirmPageContainerContent extends Component {
               !detailsComponent || !dataComponent,
           })}
           action={action}
-          title={title}
           image={image}
           titleComponent={titleComponent}
           subtitleComponent={subtitleComponent}
-          hideSubtitle={hideSubtitle}
           tokenAddress={tokenAddress}
           nonce={nonce}
           origin={origin}
-          hideTitle={hideTitle}
           toAddress={toAddress}
           transactionType={transactionType}
         />
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
index 90f3dc162..46a3f068f 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
@@ -14,8 +14,6 @@ import { getIpfsGateway } from '../../../../../selectors';
 import Identicon from '../../../../ui/identicon';
 import InfoTooltip from '../../../../ui/info-tooltip';
 import NicknamePopovers from '../../../modals/nickname-popovers';
-import { Text } from '../../../../component-library';
-import { TextVariant } from '../../../../../helpers/constants/design-system';
 import { ORIGIN_METAMASK } from '../../../../../../shared/constants/app';
 import SiteOrigin from '../../../../ui/site-origin';
 import { getAssetImageURL } from '../../../../../helpers/utils/util';
@@ -23,16 +21,13 @@ import { getAssetImageURL } from '../../../../../helpers/utils/util';
 const ConfirmPageContainerSummary = (props) => {
   const {
     action,
-    title,
     titleComponent,
     subtitleComponent,
-    hideSubtitle,
     className,
     tokenAddress,
     toAddress,
     nonce,
     origin,
-    hideTitle,
     image,
     transactionType,
   } = props;
@@ -130,26 +125,9 @@ const ConfirmPageContainerSummary = (props) => {
       <>
         <div className="confirm-page-container-summary__title">
           {renderImage()}
-          {!hideTitle ? (
-            <Text
-              className="confirm-page-container-summary__title-text"
-              variant={
-                title && title.length < 10
-                  ? TextVariant.displayMd
-                  : TextVariant.headingMd
-              }
-              as={title && title.length < 10 ? 'h1' : 'h3'}
-              title={title}
-            >
-              {titleComponent || title}
-            </Text>
-          ) : null}
+          {titleComponent}
         </div>
-        {hideSubtitle ? null : (
-          <div className="confirm-page-container-summary__subtitle">
-            {subtitleComponent}
-          </div>
-        )}
+        {subtitleComponent}
       </>
       {showNicknamePopovers && (
         <NicknamePopovers
@@ -163,17 +141,14 @@ const ConfirmPageContainerSummary = (props) => {
 
 ConfirmPageContainerSummary.propTypes = {
   action: PropTypes.string,
-  title: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   image: PropTypes.string,
   titleComponent: PropTypes.node,
   subtitleComponent: PropTypes.node,
-  hideSubtitle: PropTypes.bool,
   className: PropTypes.string,
   tokenAddress: PropTypes.string,
   toAddress: PropTypes.string,
   nonce: PropTypes.string,
   origin: PropTypes.string.isRequired,
-  hideTitle: PropTypes.bool,
   transactionType: PropTypes.string,
 };
 
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.scss b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.scss
index 05e7132e4..9514cbef2 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.scss
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/index.scss
@@ -69,31 +69,6 @@
     margin-right: 8px;
   }
 
-  &__title-text {
-    @include H1;
-
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  &__title-text-long {
-    @include H3;
-
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  &__subtitle {
-    @include H5;
-
-    color: var(--color-text-alternative);
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
   &--border {
     border-bottom: 1px solid var(--color-border-muted);
   }
diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js
index 4c31366c7..1943c964b 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container.component.js
@@ -66,7 +66,6 @@ const ConfirmPageContainer = (props) => {
     image,
     titleComponent,
     subtitleComponent,
-    hideSubtitle,
     detailsComponent,
     dataComponent,
     dataHexComponent,
@@ -123,11 +122,6 @@ const ConfirmPageContainer = (props) => {
   const shouldDisplayWarning =
     contentComponent && disabled && (errorKey || errorMessage);
 
-  const hideTitle =
-    (currentTransaction.type === TransactionType.contractInteraction ||
-      currentTransaction.type === TransactionType.deployContract) &&
-    currentTransaction.txParams?.value === '0x0';
-
   const networkName =
     NETWORK_TO_NAME_MAP[currentTransaction.chainId] || networkIdentifier;
 
@@ -203,7 +197,6 @@ const ConfirmPageContainer = (props) => {
             image={image}
             titleComponent={titleComponent}
             subtitleComponent={subtitleComponent}
-            hideSubtitle={hideSubtitle}
             detailsComponent={detailsComponent}
             dataComponent={dataComponent}
             dataHexComponent={dataHexComponent}
@@ -225,7 +218,6 @@ const ConfirmPageContainer = (props) => {
             rejectNText={t('rejectTxsN', [unapprovedTxCount])}
             origin={origin}
             ethGasPriceWarning={ethGasPriceWarning}
-            hideTitle={hideTitle}
             supportsEIP1559={supportsEIP1559}
             currentTransaction={currentTransaction}
             nativeCurrency={nativeCurrency}
@@ -341,7 +333,6 @@ const ConfirmPageContainer = (props) => {
 ConfirmPageContainer.propTypes = {
   // Header
   action: PropTypes.string,
-  hideSubtitle: PropTypes.bool,
   onEdit: PropTypes.func,
   showEdit: PropTypes.bool,
   subtitleComponent: PropTypes.node,
diff --git a/ui/components/app/confirm-subtitle/README.mdx b/ui/components/app/confirm-subtitle/README.mdx
new file mode 100644
index 000000000..8c5da7bec
--- /dev/null
+++ b/ui/components/app/confirm-subtitle/README.mdx
@@ -0,0 +1,10 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+import { ConfirmSubTitle } from '.';
+
+# Confirm Sub Title
+
+Confirm Sub Title is used on confirmation screen to display transaction amoutn in header.
+
+<Canvas>
+  <Story id="components-app-ConfirmSubTitle--default-story" />
+</Canvas>
diff --git a/ui/components/app/confirm-subtitle/confirm-subtitle.js b/ui/components/app/confirm-subtitle/confirm-subtitle.js
new file mode 100644
index 000000000..fd4366d87
--- /dev/null
+++ b/ui/components/app/confirm-subtitle/confirm-subtitle.js
@@ -0,0 +1,56 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+
+import { SECONDARY } from '../../../helpers/constants/common';
+import { Text } from '../../component-library';
+import {
+  Color,
+  FONT_WEIGHT,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display';
+import { getShouldShowFiat } from '../../../selectors';
+import { useTransactionInfo } from '../../../hooks/useTransactionInfo';
+
+const ConfirmSubTitle = ({
+  txData,
+  hexTransactionAmount,
+  subtitleComponent,
+}) => {
+  const shouldShowFiat = useSelector(getShouldShowFiat);
+  const { isNftTransfer } = useTransactionInfo(txData);
+
+  if (!shouldShowFiat && !isNftTransfer) {
+    return null;
+  }
+
+  if (subtitleComponent) {
+    return subtitleComponent;
+  }
+
+  return (
+    <Text
+      as="h5"
+      ellipsis
+      fontWeight={FONT_WEIGHT.NORMAL}
+      variant={TextVariant.bodyMd}
+      color={Color.textAlternative}
+    >
+      <UserPreferencedCurrencyDisplay
+        value={hexTransactionAmount}
+        type={SECONDARY}
+        showEthLogo
+        hideLabel
+      />
+    </Text>
+  );
+};
+
+ConfirmSubTitle.propTypes = {
+  hexTransactionAmount: PropTypes.string,
+  subtitleComponent: PropTypes.element,
+  txData: PropTypes.object.isRequired,
+};
+
+export default ConfirmSubTitle;
diff --git a/ui/components/app/confirm-subtitle/confirm-subtitle.stories.js b/ui/components/app/confirm-subtitle/confirm-subtitle.stories.js
new file mode 100644
index 000000000..9a05e509c
--- /dev/null
+++ b/ui/components/app/confirm-subtitle/confirm-subtitle.stories.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+
+import mockState from '../../../../test/data/mock-state.json';
+import configureStore from '../../../store/store';
+
+import README from './README.mdx';
+import ConfirmSubTitle from './confirm-subtitle';
+
+mockState.metamask.preferences.showFiatInTestnets = true;
+const store = configureStore(mockState);
+
+export default {
+  title: 'Components/App/ConfirmSubTitle',
+
+  component: ConfirmSubTitle,
+  decorators: [(story) => <Provider store={store}>{story()}</Provider>],
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    txData: 'object',
+    hexTransactionAmount: 'number',
+    title: 'string',
+  },
+  args: {
+    txData: {
+      txParams: {},
+      type: 'transfer',
+    },
+    hexTransactionAmount: '0x9184e72a000',
+    subtitleComponent: undefined,
+  },
+};
+
+export const DefaultStory = (args) => {
+  return <ConfirmSubTitle {...args} />;
+};
+
+DefaultStory.storyName = 'Default';
+
+export const CustomSubTitleStory = (args) => {
+  return <ConfirmSubTitle {...args} />;
+};
+
+CustomSubTitleStory.storyName = 'CustomSubTitle';
+CustomSubTitleStory.args = {
+  subtitleComponent: 'Any custom sub title passed',
+};
diff --git a/ui/components/app/confirm-subtitle/confirm-subtitle.test.js b/ui/components/app/confirm-subtitle/confirm-subtitle.test.js
new file mode 100644
index 000000000..ac2662a39
--- /dev/null
+++ b/ui/components/app/confirm-subtitle/confirm-subtitle.test.js
@@ -0,0 +1,80 @@
+import React from 'react';
+
+import mockState from '../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import configureStore from '../../../store/store';
+import ConfirmSubTitle from './confirm-subtitle';
+
+describe('ConfirmSubTitle', () => {
+  let store;
+  beforeEach(() => {
+    mockState.metamask.preferences.showFiatInTestnets = true;
+    store = configureStore(mockState);
+  });
+
+  it('should render subtitle correctly', async () => {
+    const { findByText } = renderWithProvider(
+      <ConfirmSubTitle
+        txData={{
+          txParams: {},
+        }}
+        hexTransactionAmount="0x9184e72a000"
+      />,
+      store,
+    );
+    expect(await findByText('$0.01')).toBeInTheDocument();
+  });
+
+  it('should return null if showFiatInTestnets preference if false', () => {
+    mockState.metamask.preferences.showFiatInTestnets = false;
+    store = configureStore(mockState);
+
+    const { container } = renderWithProvider(
+      <ConfirmSubTitle
+        txData={{
+          txParams: {},
+        }}
+        hexTransactionAmount="0x9184e72a000"
+      />,
+      store,
+    );
+    expect(container.firstChild).toStrictEqual(null);
+  });
+
+  it('should not null if showFiatInTestnets preference if false but it is NFT Transfer', async () => {
+    mockState.metamask.preferences.showFiatInTestnets = false;
+    mockState.metamask.allNftContracts = {
+      [mockState.metamask.selectedAddress]: {
+        [mockState.metamask.provider.chainId]: [{ address: '0x9' }],
+      },
+    };
+    store = configureStore(mockState);
+
+    const { findByText } = renderWithProvider(
+      <ConfirmSubTitle
+        txData={{
+          txParams: {
+            to: '0x9',
+          },
+        }}
+        hexTransactionAmount="0x9184e72a000"
+      />,
+      store,
+    );
+    expect(await findByText('0.00001')).toBeInTheDocument();
+  });
+
+  it('should render subtitleComponent if passed', () => {
+    const { getByText } = renderWithProvider(
+      <ConfirmSubTitle
+        txData={{
+          txParams: {},
+        }}
+        hexTransactionAmount="0x9184e72a000"
+        subtitleComponent={<div>dummy_sub_title_passed</div>}
+      />,
+      store,
+    );
+    expect(getByText('dummy_sub_title_passed')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/confirm-subtitle/index.js b/ui/components/app/confirm-subtitle/index.js
new file mode 100644
index 000000000..ecb696931
--- /dev/null
+++ b/ui/components/app/confirm-subtitle/index.js
@@ -0,0 +1 @@
+export { default as ConfirmSubTitle } from './confirm-subtitle';
diff --git a/ui/components/app/confirm-title/README.mdx b/ui/components/app/confirm-title/README.mdx
new file mode 100644
index 000000000..d68f7d30c
--- /dev/null
+++ b/ui/components/app/confirm-title/README.mdx
@@ -0,0 +1,10 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+import { ConfirmTitle } from '.';
+
+# Confirm Title
+
+Confirm Title is used on the confirmation screen to display the transaction amount in the header.
+
+<Canvas>
+  <Story id="components-app-ConfirmTitle--default-story" />
+</Canvas>
diff --git a/ui/components/app/confirm-title/confirm-title.js b/ui/components/app/confirm-title/confirm-title.js
new file mode 100644
index 000000000..125d8d8a3
--- /dev/null
+++ b/ui/components/app/confirm-title/confirm-title.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { TransactionType } from '../../../../shared/constants/transaction';
+import { PRIMARY } from '../../../helpers/constants/common';
+import { Text } from '../../component-library';
+import {
+  FONT_WEIGHT,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display';
+
+const ConfirmTitle = ({ title, hexTransactionAmount, txData }) => {
+  const isContractInteraction =
+    txData.type === TransactionType.contractInteraction;
+
+  const hideTitle =
+    (isContractInteraction || txData.type === TransactionType.deployContract) &&
+    txData.txParams?.value === '0x0';
+
+  if (hideTitle) {
+    return null;
+  }
+
+  if (title) {
+    return (
+      <Text
+        as={title && title.length < 10 ? 'h1' : 'h3'}
+        ellipsis
+        title={title}
+        variant={
+          title && title.length < 10
+            ? TextVariant.displayMd
+            : TextVariant.headingMd
+        }
+        fontWeight={FONT_WEIGHT.NORMAL}
+      >
+        {title}
+      </Text>
+    );
+  }
+
+  return (
+    <Text
+      as="h3"
+      ellipsis
+      fontWeight={FONT_WEIGHT.NORMAL}
+      variant={TextVariant.headingMd}
+    >
+      <UserPreferencedCurrencyDisplay
+        ethLogoHeight={24}
+        hideLabel={!isContractInteraction}
+        showCurrencySuffix={isContractInteraction}
+        showEthLogo
+        type={PRIMARY}
+        value={hexTransactionAmount}
+      />
+    </Text>
+  );
+};
+
+ConfirmTitle.propTypes = {
+  txData: PropTypes.object.isRequired,
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  hexTransactionAmount: PropTypes.string,
+};
+
+export default ConfirmTitle;
diff --git a/ui/components/app/confirm-title/confirm-title.stories.js b/ui/components/app/confirm-title/confirm-title.stories.js
new file mode 100644
index 000000000..60037daa1
--- /dev/null
+++ b/ui/components/app/confirm-title/confirm-title.stories.js
@@ -0,0 +1,54 @@
+import React from 'react';
+import README from './README.mdx';
+import ConfirmTitle from './confirm-title';
+
+export default {
+  title: 'Components/App/ConfirmTitle',
+
+  component: ConfirmTitle,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    txData: 'object',
+    hexTransactionAmount: 'string',
+    title: 'string',
+  },
+  args: {
+    txData: {
+      txParams: {},
+      type: 'transfer',
+    },
+    hexTransactionAmount: '0x9184e72a000',
+    title: undefined,
+  },
+};
+
+export const DefaultStory = (args) => {
+  return <ConfirmTitle {...args} />;
+};
+
+DefaultStory.storyName = 'Default';
+
+export const ContractInteractionStory = (args) => {
+  return <ConfirmTitle {...args} />;
+};
+
+ContractInteractionStory.storyName = 'ContractInteraction';
+ContractInteractionStory.args = {
+  txData: {
+    txParams: {},
+    type: 'contractInteraction',
+  },
+};
+
+export const CustomTitleStory = (args) => {
+  return <ConfirmTitle {...args} />;
+};
+
+CustomTitleStory.storyName = 'CustomTitle';
+CustomTitleStory.args = {
+  title: 'Any custom title passed',
+};
diff --git a/ui/components/app/confirm-title/confirm-title.test.js b/ui/components/app/confirm-title/confirm-title.test.js
new file mode 100644
index 000000000..e6098dd04
--- /dev/null
+++ b/ui/components/app/confirm-title/confirm-title.test.js
@@ -0,0 +1,54 @@
+import React from 'react';
+import { TransactionType } from '../../../../shared/constants/transaction';
+
+import mockState from '../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+
+import configureStore from '../../../store/store';
+import ConfirmTitle from './confirm-title';
+
+describe('ConfirmTitle', () => {
+  const store = configureStore(mockState);
+
+  it('should render title correctly', async () => {
+    const { findByText } = renderWithProvider(
+      <ConfirmTitle
+        txData={{
+          txParams: {},
+        }}
+        hexTransactionAmount="0x9184e72a000"
+      />,
+      store,
+    );
+    expect(await findByText('0.00001')).toBeInTheDocument();
+  });
+
+  it('should return null if transaction is contract interation with 0 value', () => {
+    const { container } = renderWithProvider(
+      <ConfirmTitle
+        txData={{
+          txParams: {
+            value: '0x0',
+          },
+          type: TransactionType.contractInteraction,
+        }}
+      />,
+      store,
+    );
+    expect(container.firstChild).toStrictEqual(null);
+  });
+
+  it('should render title if passed', () => {
+    const { getByText } = renderWithProvider(
+      <ConfirmTitle
+        txData={{
+          txParams: {},
+        }}
+        hexTransactionAmount="0x5"
+        title="dummy_title_passed"
+      />,
+      store,
+    );
+    expect(getByText('dummy_title_passed')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/confirm-title/index.js b/ui/components/app/confirm-title/index.js
new file mode 100644
index 000000000..11db0d32c
--- /dev/null
+++ b/ui/components/app/confirm-title/index.js
@@ -0,0 +1 @@
+export { default as ConfirmTitle } from './confirm-title';
diff --git a/ui/hooks/useTransactionInfo.js b/ui/hooks/useTransactionInfo.js
new file mode 100644
index 000000000..245a24734
--- /dev/null
+++ b/ui/hooks/useTransactionInfo.js
@@ -0,0 +1,19 @@
+import { useSelector } from 'react-redux';
+
+import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
+
+export const useTransactionInfo = (txData = {}) => {
+  const {
+    allNftContracts,
+    selectedAddress,
+    provider: { chainId },
+  } = useSelector((state) => state.metamask);
+
+  const isNftTransfer = Boolean(
+    allNftContracts?.[selectedAddress]?.[chainId]?.find((contract) => {
+      return isEqualCaseInsensitive(contract.address, txData.txParams.to);
+    }),
+  );
+
+  return { isNftTransfer };
+};
diff --git a/ui/hooks/useTransactionInfo.test.js b/ui/hooks/useTransactionInfo.test.js
new file mode 100644
index 000000000..e7fa5f40a
--- /dev/null
+++ b/ui/hooks/useTransactionInfo.test.js
@@ -0,0 +1,36 @@
+import { renderHookWithProvider } from '../../test/lib/render-helpers';
+import mockState from '../../test/data/mock-state.json';
+import { useTransactionInfo } from './useTransactionInfo';
+
+describe('useTransactionInfo', () => {
+  describe('isNftTransfer', () => {
+    it('should return false if transaction is not NFT transfer', () => {
+      const { result } = renderHookWithProvider(
+        () =>
+          useTransactionInfo({
+            txParams: {},
+          }),
+        mockState,
+      );
+      expect(result.current.isNftTransfer).toStrictEqual(false);
+    });
+    it('should return true if transaction is NFT transfer', () => {
+      mockState.metamask.allNftContracts = {
+        [mockState.metamask.selectedAddress]: {
+          [mockState.metamask.provider.chainId]: [{ address: '0x9' }],
+        },
+      };
+
+      const { result } = renderHookWithProvider(
+        () =>
+          useTransactionInfo({
+            txParams: {
+              to: '0x9',
+            },
+          }),
+        mockState,
+      );
+      expect(result.current.isNftTransfer).toStrictEqual(true);
+    });
+  });
+});
diff --git a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
index 46a976a57..c48acbbe6 100644
--- a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
+++ b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
@@ -254,7 +254,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
           class="confirm-page-container-summary__title"
         >
           <h3
-            class="box mm-text confirm-page-container-summary__title-text mm-text--heading-md mm-text--color-text-default box--flex-direction-row"
+            class="box mm-text mm-text--heading-md mm-text--font-weight-normal mm-text--ellipsis mm-text--color-text-default box--flex-direction-row"
           >
             <div
               class="currency-display-component"
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
index dd025605d..71af5be39 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -58,6 +58,8 @@ import {
 import TransactionAlerts from '../../components/app/transaction-alerts';
 import { ConfirmHexData } from '../../components/app/confirm-hexdata';
 import { ConfirmData } from '../../components/app/confirm-data';
+import { ConfirmTitle } from '../../components/app/confirm-title';
+import { ConfirmSubTitle } from '../../components/app/confirm-subtitle';
 
 const renderHeartBeatIfNotInTest = () =>
   process.env.IN_TEST ? null : <LoadingHeartBeat />;
@@ -108,7 +110,6 @@ export default class ConfirmTransactionBase extends Component {
     contentComponent: PropTypes.node,
     dataComponent: PropTypes.node,
     dataHexComponent: PropTypes.node,
-    hideSubtitle: PropTypes.bool,
     tokenAddress: PropTypes.string,
     customTokenAmount: PropTypes.string,
     dappProposedTokenAmount: PropTypes.string,
@@ -837,38 +838,24 @@ export default class ConfirmTransactionBase extends Component {
   renderTitleComponent() {
     const { title, hexTransactionAmount, txData } = this.props;
 
-    // Title string passed in by props takes priority
-    if (title) {
-      return null;
-    }
-
-    const isContractInteraction =
-      txData.type === TransactionType.contractInteraction;
-
     return (
-      <UserPreferencedCurrencyDisplay
-        value={hexTransactionAmount}
-        type={PRIMARY}
-        showEthLogo
-        ethLogoHeight={24}
-        hideLabel={!isContractInteraction}
-        showCurrencySuffix={isContractInteraction}
+      <ConfirmTitle
+        title={title}
+        hexTransactionAmount={hexTransactionAmount}
+        txData={txData}
       />
     );
   }
 
   renderSubtitleComponent() {
-    const { subtitleComponent, hexTransactionAmount } = this.props;
+    const { subtitleComponent, hexTransactionAmount, txData } = this.props;
 
     return (
-      subtitleComponent || (
-        <UserPreferencedCurrencyDisplay
-          value={hexTransactionAmount}
-          type={SECONDARY}
-          showEthLogo
-          hideLabel
-        />
-      )
+      <ConfirmSubTitle
+        hexTransactionAmount={hexTransactionAmount}
+        subtitleComponent={subtitleComponent}
+        txData={txData}
+      />
     );
   }
 
@@ -946,8 +933,6 @@ export default class ConfirmTransactionBase extends Component {
       toEns,
       toNickname,
       methodData,
-      title,
-      hideSubtitle,
       tokenAddress,
       contentComponent,
       onEdit,
@@ -1024,11 +1009,9 @@ export default class ConfirmTransactionBase extends Component {
           toNickname={toNickname}
           showEdit={!isContractInteractionFromDapp && Boolean(onEdit)}
           action={functionType}
-          title={title}
           image={image}
           titleComponent={this.renderTitleComponent()}
           subtitleComponent={this.renderSubtitleComponent()}
-          hideSubtitle={hideSubtitle}
           detailsComponent={this.renderDetails()}
           dataComponent={this.renderData(functionType)}
           dataHexComponent={this.renderDataHex(functionType)}
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
index 12078cc87..9abc1ee22 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -63,7 +63,6 @@ import {
   TransactionStatus,
   TransactionType,
 } from '../../../shared/constants/transaction';
-import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { getTokenAddressParam } from '../../helpers/utils/token-util';
 import { calcGasTotal } from '../../../shared/lib/transactions-controller-utils';
 import ConfirmTransactionBase from './confirm-transaction-base.component';
@@ -105,8 +104,6 @@ const mapStateToProps = (state, ownProps) => {
     network,
     unapprovedTxs,
     nextNonce,
-    allNftContracts,
-    selectedAddress,
     provider: { chainId },
   } = metamask;
   const { tokenData, txData, tokenProps, nonce } = confirmTransaction;
@@ -184,12 +181,6 @@ const mapStateToProps = (state, ownProps) => {
     customTxParamsData,
   );
 
-  const isNftTransfer = Boolean(
-    allNftContracts?.[selectedAddress]?.[chainId]?.find((contract) => {
-      return isEqualCaseInsensitive(contract.address, fullTxData.txParams.to);
-    }),
-  );
-
   customNonceValue = getCustomNonceValue(state);
   const isEthGasPrice = getIsEthGasPriceFetched(state);
   const noGasPrice = !supportsEIP1559 && getNoGasPriceFetched(state);
@@ -235,7 +226,6 @@ const mapStateToProps = (state, ownProps) => {
     useNonceField: getUseNonceField(state),
     customNonceValue,
     insufficientBalance,
-    hideSubtitle: !getShouldShowFiat(state) && !isNftTransfer,
     hideFiatConversion: !getShouldShowFiat(state),
     type,
     nextNonce,

From 0d2c54e808f5bfd1a8102a69e40479c4a98c5b48 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Thu, 23 Mar 2023 12:04:24 -0700
Subject: [PATCH 066/129] Fix Signature Request scroll (#18305)

* signature-req: fix scroll

* signature-req: fix scroll allow items to shrink
---
 .../app/signature-request-original/index.scss         | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/components/app/signature-request-original/index.scss b/ui/components/app/signature-request-original/index.scss
index 281fae02f..10466f21b 100644
--- a/ui/components/app/signature-request-original/index.scss
+++ b/ui/components/app/signature-request-original/index.scss
@@ -67,6 +67,13 @@
     flex: 1 1 0;
     min-height: 0;
     max-width: 100%;
+    overflow-y: auto;
+    overflow-x: hidden;
+
+    > * {
+      flex: 0 0 auto;
+      min-height: 0;
+    }
   }
 
   &__origin {
@@ -92,13 +99,9 @@
   }
 
   &__rows {
-    overflow-y: auto;
-    overflow-x: hidden;
     border-top: 1px solid var(--color-border-default);
     display: flex;
     flex-flow: column;
-    flex: 1 1 0;
-    min-height: 0;
   }
 
   &__row {

From fcdc5c9c149f36c3d0331cf45e48c580782064a5 Mon Sep 17 00:00:00 2001
From: Victorien Gauch <85494462+VGau@users.noreply.github.com>
Date: Thu, 23 Mar 2023 20:56:07 +0100
Subject: [PATCH 067/129] fix: update zkevm feature toggle date (#18307)

---
 shared/constants/network.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 077412623..e2d6cf40e 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -688,4 +688,4 @@ export const FEATURED_RPCS: RPCDefinition[] = [
 ];
 
 export const SHOULD_SHOW_LINEA_TESTNET_NETWORK =
-  new Date().getTime() > Date.UTC(2023, 2, 28);
+  new Date().getTime() > Date.UTC(2023, 2, 28, 8);

From 79b2deb19439755d4a4199f27db68920ab37f737 Mon Sep 17 00:00:00 2001
From: Garrett Bear <gwhisten@gmail.com>
Date: Thu, 23 Mar 2023 13:00:37 -0700
Subject: [PATCH 068/129] update text component color to use box color (#18246)

snapshot updates

fix snapshots

add background colors

fix snapshots
---
 .../__snapshots__/avatar-account.test.js.snap |  2 +-
 .../__snapshots__/avatar-base.test.js.snap    |  2 +-
 .../avatar-base/avatar-base.test.js           |  4 +--
 .../__snapshots__/avatar-favicon.test.js.snap |  2 +-
 .../__snapshots__/avatar-icon.test.js.snap    |  2 +-
 .../avatar-icon/avatar-icon.test.js           |  4 +--
 .../__snapshots__/avatar-network.test.js.snap |  2 +-
 .../avatar-network/avatar-network.test.js     |  4 +--
 .../__snapshots__/avatar-token.test.js.snap   |  2 +-
 .../avatar-token/avatar-token.test.js         |  4 +--
 .../__snapshots__/banner-alert.test.js.snap   |  4 +--
 .../__snapshots__/banner-base.test.js.snap    |  4 +--
 .../__snapshots__/banner-tip.test.js.snap     |  4 +--
 .../__snapshots__/button-base.test.js.snap    |  4 +--
 .../__snapshots__/button-link.test.js.snap    |  2 +-
 .../__snapshots__/button-primary.test.js.snap |  2 +-
 .../button-secondary.test.js.snap             |  2 +-
 .../button/__snapshots__/button.test.js.snap  |  8 ++---
 .../form-text-field.test.js.snap              |  2 +-
 .../form-text-field/form-text-field.test.js   |  4 +--
 .../__snapshots__/help-text.test.js.snap      |  2 +-
 .../help-text/help-text.test.js               | 18 +++++-----
 .../input/__snapshots__/input.test.js.snap    |  2 +-
 .../label/__snapshots__/label.test.js.snap    |  2 +-
 .../__snapshots__/picker-network.test.js.snap |  4 +--
 .../__snapshots__/tag-url.test.js.snap        |  4 +--
 .../tag/__snapshots__/tag.test.js.snap        |  2 +-
 .../text-field-search.test.js.snap            |  2 +-
 .../__snapshots__/text-field.test.js.snap     |  2 +-
 .../text/__snapshots__/text.test.js.snap      | 20 +++++------
 ui/components/component-library/text/text.js  |  2 +-
 .../component-library/text/text.scss          |  6 ----
 .../component-library/text/text.stories.js    |  9 +++++
 .../component-library/text/text.test.js       | 34 +++++++------------
 .../__snapshots__/jwt-dropdown.test.js.snap   |  2 +-
 .../__snapshots__/jwt-url-form.test.js.snap   |  4 +--
 .../__snapshots__/note-to-trader.test.js.snap |  4 +--
 .../account-list-item.test.js.snap            | 10 +++---
 .../detected-token-banner.test.js.snap        |  4 +--
 .../multichain-import-token-link.test.js.snap |  8 ++---
 .../multichain-token-list-item.test.js.snap   | 10 +++---
 ...irm-approve-content.component.test.js.snap | 24 ++++++-------
 .../confirm-transaction-base.test.js.snap     |  2 +-
 .../__snapshots__/reveal-seed.test.js.snap    | 24 ++++++-------
 .../experimental-tab.test.js.snap             |  4 +--
 45 files changed, 128 insertions(+), 141 deletions(-)

diff --git a/ui/components/component-library/avatar-account/__snapshots__/avatar-account.test.js.snap b/ui/components/component-library/avatar-account/__snapshots__/avatar-account.test.js.snap
index 0dfe9536f..6a46eb546 100644
--- a/ui/components/component-library/avatar-account/__snapshots__/avatar-account.test.js.snap
+++ b/ui/components/component-library/avatar-account/__snapshots__/avatar-account.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarAccount should render correctly 1`] = `
 <div>
   <div
-    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
     data-testid="avatar-account"
   >
     <div
diff --git a/ui/components/component-library/avatar-base/__snapshots__/avatar-base.test.js.snap b/ui/components/component-library/avatar-base/__snapshots__/avatar-base.test.js.snap
index 91206391f..08ef452cd 100644
--- a/ui/components/component-library/avatar-base/__snapshots__/avatar-base.test.js.snap
+++ b/ui/components/component-library/avatar-base/__snapshots__/avatar-base.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarBase should render correctly 1`] = `
 <div>
   <div
-    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
     data-testid="avatar-base"
   />
 </div>
diff --git a/ui/components/component-library/avatar-base/avatar-base.test.js b/ui/components/component-library/avatar-base/avatar-base.test.js
index cf0058dc9..4d5505282 100644
--- a/ui/components/component-library/avatar-base/avatar-base.test.js
+++ b/ui/components/component-library/avatar-base/avatar-base.test.js
@@ -73,10 +73,10 @@ describe('AvatarBase', () => {
       </>,
     );
     expect(getByTestId(TextColor.successDefault)).toHaveClass(
-      `mm-text--color-${TextColor.successDefault}`,
+      `box--color-${TextColor.successDefault}`,
     );
     expect(getByTestId(TextColor.errorDefault)).toHaveClass(
-      `mm-text--color-${TextColor.errorDefault}`,
+      `box--color-${TextColor.errorDefault}`,
     );
   });
   // background color
diff --git a/ui/components/component-library/avatar-favicon/__snapshots__/avatar-favicon.test.js.snap b/ui/components/component-library/avatar-favicon/__snapshots__/avatar-favicon.test.js.snap
index f1c969961..0e223a9a4 100644
--- a/ui/components/component-library/avatar-favicon/__snapshots__/avatar-favicon.test.js.snap
+++ b/ui/components/component-library/avatar-favicon/__snapshots__/avatar-favicon.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarFavicon should render correctly 1`] = `
 <div>
   <div
-    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-favicon mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-favicon mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     data-testid="avatar-favicon"
   >
     <span
diff --git a/ui/components/component-library/avatar-icon/__snapshots__/avatar-icon.test.js.snap b/ui/components/component-library/avatar-icon/__snapshots__/avatar-icon.test.js.snap
index a97d4408e..e1ee4f9de 100644
--- a/ui/components/component-library/avatar-icon/__snapshots__/avatar-icon.test.js.snap
+++ b/ui/components/component-library/avatar-icon/__snapshots__/avatar-icon.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarIcon should render correctly 1`] = `
 <div>
   <div
-    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-icon mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-primary-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-muted box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-icon mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-primary-muted box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     data-testid="avatar-icon"
   >
     <span
diff --git a/ui/components/component-library/avatar-icon/avatar-icon.test.js b/ui/components/component-library/avatar-icon/avatar-icon.test.js
index 65f8eee21..73d7fbbcc 100644
--- a/ui/components/component-library/avatar-icon/avatar-icon.test.js
+++ b/ui/components/component-library/avatar-icon/avatar-icon.test.js
@@ -100,9 +100,7 @@ describe('AvatarIcon', () => {
       />,
     );
 
-    expect(getByTestId('success')).toHaveClass(
-      'mm-text--color-success-default',
-    );
+    expect(getByTestId('success')).toHaveClass('box--color-success-default');
     expect(getByTestId('success')).toHaveClass(
       'box--background-color-success-muted',
     );
diff --git a/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.js.snap b/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.js.snap
index 60137e80c..71f0095fa 100644
--- a/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.js.snap
+++ b/ui/components/component-library/avatar-network/__snapshots__/avatar-network.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarNetwork should render correctly 1`] = `
 <div>
   <div
-    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     data-testid="avatar-network"
   >
     ?
diff --git a/ui/components/component-library/avatar-network/avatar-network.test.js b/ui/components/component-library/avatar-network/avatar-network.test.js
index 6b2ee4f92..cded1d76a 100644
--- a/ui/components/component-library/avatar-network/avatar-network.test.js
+++ b/ui/components/component-library/avatar-network/avatar-network.test.js
@@ -75,10 +75,10 @@ describe('AvatarNetwork', () => {
       </>,
     );
     expect(getByTestId(TextColor.successDefault)).toHaveClass(
-      `mm-text--color-${TextColor.successDefault}`,
+      `box--color-${TextColor.successDefault}`,
     );
     expect(getByTestId(TextColor.errorDefault)).toHaveClass(
-      `mm-text--color-${TextColor.errorDefault}`,
+      `box--color-${TextColor.errorDefault}`,
     );
   });
   // background color
diff --git a/ui/components/component-library/avatar-token/__snapshots__/avatar-token.test.js.snap b/ui/components/component-library/avatar-token/__snapshots__/avatar-token.test.js.snap
index b67f6c466..39d54154f 100644
--- a/ui/components/component-library/avatar-token/__snapshots__/avatar-token.test.js.snap
+++ b/ui/components/component-library/avatar-token/__snapshots__/avatar-token.test.js.snap
@@ -3,7 +3,7 @@
 exports[`AvatarToken should render correctly 1`] = `
 <div>
   <div
-    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
+    class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     data-testid="avatar-token"
   >
     <img
diff --git a/ui/components/component-library/avatar-token/avatar-token.test.js b/ui/components/component-library/avatar-token/avatar-token.test.js
index 53d8e8d87..3a711782d 100644
--- a/ui/components/component-library/avatar-token/avatar-token.test.js
+++ b/ui/components/component-library/avatar-token/avatar-token.test.js
@@ -73,10 +73,10 @@ describe('AvatarToken', () => {
       </>,
     );
     expect(getByTestId(TextColor.successDefault)).toHaveClass(
-      `mm-text--color-${TextColor.successDefault}`,
+      `box--color-${TextColor.successDefault}`,
     );
     expect(getByTestId(TextColor.errorDefault)).toHaveClass(
-      `mm-text--color-${TextColor.errorDefault}`,
+      `box--color-${TextColor.errorDefault}`,
     );
   });
   // background color
diff --git a/ui/components/component-library/banner-alert/__snapshots__/banner-alert.test.js.snap b/ui/components/component-library/banner-alert/__snapshots__/banner-alert.test.js.snap
index c73b24a20..0ab03644a 100644
--- a/ui/components/component-library/banner-alert/__snapshots__/banner-alert.test.js.snap
+++ b/ui/components/component-library/banner-alert/__snapshots__/banner-alert.test.js.snap
@@ -12,12 +12,12 @@ exports[`BannerAlert should render BannerAlert element correctly 1`] = `
     />
     <div>
       <h5
-        class="box mm-text mm-banner-base__title mm-text--body-lg-medium mm-text--color-text-default box--flex-direction-row"
+        class="box mm-text mm-banner-base__title mm-text--body-lg-medium box--flex-direction-row box--color-text-default"
       >
         BannerAlert test
       </h5>
       <p
-        class="box mm-text mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+        class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-default"
       >
         should render BannerAlert element correctly
       </p>
diff --git a/ui/components/component-library/banner-base/__snapshots__/banner-base.test.js.snap b/ui/components/component-library/banner-base/__snapshots__/banner-base.test.js.snap
index 38b9d3259..12dd091d2 100644
--- a/ui/components/component-library/banner-base/__snapshots__/banner-base.test.js.snap
+++ b/ui/components/component-library/banner-base/__snapshots__/banner-base.test.js.snap
@@ -8,12 +8,12 @@ exports[`BannerBase should render bannerbase element correctly 1`] = `
   >
     <div>
       <h5
-        class="box mm-text mm-banner-base__title mm-text--body-lg-medium mm-text--color-text-default box--flex-direction-row"
+        class="box mm-text mm-banner-base__title mm-text--body-lg-medium box--flex-direction-row box--color-text-default"
       >
         Bannerbase test
       </h5>
       <p
-        class="box mm-text mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+        class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-default"
       >
         should render bannerbase element correctly
       </p>
diff --git a/ui/components/component-library/banner-tip/__snapshots__/banner-tip.test.js.snap b/ui/components/component-library/banner-tip/__snapshots__/banner-tip.test.js.snap
index c44c22219..604ab19bd 100644
--- a/ui/components/component-library/banner-tip/__snapshots__/banner-tip.test.js.snap
+++ b/ui/components/component-library/banner-tip/__snapshots__/banner-tip.test.js.snap
@@ -17,12 +17,12 @@ exports[`BannerTip should render BannerTip element correctly 1`] = `
     </div>
     <div>
       <h5
-        class="box mm-text mm-banner-base__title mm-text--body-lg-medium mm-text--color-text-default box--flex-direction-row"
+        class="box mm-text mm-banner-base__title mm-text--body-lg-medium box--flex-direction-row box--color-text-default"
       >
         BannerTip test
       </h5>
       <p
-        class="box mm-text mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+        class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-default"
       >
         should render BannerTip element correctly
       </p>
diff --git a/ui/components/component-library/button-base/__snapshots__/button-base.test.js.snap b/ui/components/component-library/button-base/__snapshots__/button-base.test.js.snap
index 9e3221f01..c37daaed9 100644
--- a/ui/components/component-library/button-base/__snapshots__/button-base.test.js.snap
+++ b/ui/components/component-library/button-base/__snapshots__/button-base.test.js.snap
@@ -3,7 +3,7 @@
 exports[`ButtonBase should render anchor element correctly by href and externalLink, href target and rel exist 1`] = `
 <div>
   <a
-    class="box mm-text mm-button-base mm-button-base--size-md mm-text--body-md mm-text--color-text-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-pill"
     data-testid="button-base"
     href="https://www.test.com/"
     rel="noopener noreferrer"
@@ -17,7 +17,7 @@ exports[`ButtonBase should render anchor element correctly by href and externalL
 exports[`ButtonBase should render button element correctly and match snapshot 1`] = `
 <div>
   <button
-    class="box mm-text mm-button-base mm-button-base--size-md mm-text--body-md mm-text--color-text-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-pill"
     data-testid="button-base"
   >
     Button base
diff --git a/ui/components/component-library/button-link/__snapshots__/button-link.test.js.snap b/ui/components/component-library/button-link/__snapshots__/button-link.test.js.snap
index 1a5c0af51..6dce59afa 100644
--- a/ui/components/component-library/button-link/__snapshots__/button-link.test.js.snap
+++ b/ui/components/component-library/button-link/__snapshots__/button-link.test.js.snap
@@ -3,7 +3,7 @@
 exports[`ButtonLink should render button element correctly 1`] = `
 <div>
   <button
-    class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+    class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
     data-testid="button-link"
   >
     Button Link
diff --git a/ui/components/component-library/button-primary/__snapshots__/button-primary.test.js.snap b/ui/components/component-library/button-primary/__snapshots__/button-primary.test.js.snap
index 8768e1c7c..5d8657dd5 100644
--- a/ui/components/component-library/button-primary/__snapshots__/button-primary.test.js.snap
+++ b/ui/components/component-library/button-primary/__snapshots__/button-primary.test.js.snap
@@ -3,7 +3,7 @@
 exports[`ButtonPrimary should render button element correctly 1`] = `
 <div>
   <button
-    class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-default box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
     data-testid="button-primary"
   >
     Button Primary
diff --git a/ui/components/component-library/button-secondary/__snapshots__/button-secondary.test.js.snap b/ui/components/component-library/button-secondary/__snapshots__/button-secondary.test.js.snap
index fcc63172f..692a5901c 100644
--- a/ui/components/component-library/button-secondary/__snapshots__/button-secondary.test.js.snap
+++ b/ui/components/component-library/button-secondary/__snapshots__/button-secondary.test.js.snap
@@ -3,7 +3,7 @@
 exports[`ButtonSecondary should render button element correctly 1`] = `
 <div>
   <button
-    class="box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md mm-text--color-primary-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
     data-testid="button-secondary"
   >
     Button Secondary
diff --git a/ui/components/component-library/button/__snapshots__/button.test.js.snap b/ui/components/component-library/button/__snapshots__/button.test.js.snap
index 7d795a179..9e26c51a5 100644
--- a/ui/components/component-library/button/__snapshots__/button.test.js.snap
+++ b/ui/components/component-library/button/__snapshots__/button.test.js.snap
@@ -3,7 +3,7 @@
 exports[`Button should render button element correctly 1`] = `
 <div>
   <button
-    class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-default box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
     data-testid="button"
   >
     Button
@@ -14,19 +14,19 @@ exports[`Button should render button element correctly 1`] = `
 exports[`Button should render with different button types 1`] = `
 <div>
   <button
-    class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-default box--rounded-pill"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
     data-testid="primary"
   >
     Button
   </button>
   <button
-    class="box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md mm-text--color-primary-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-secondary mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
     data-testid="secondary"
   >
     Button
   </button>
   <button
-    class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+    class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
     data-testid="link"
   >
     Button
diff --git a/ui/components/component-library/form-text-field/__snapshots__/form-text-field.test.js.snap b/ui/components/component-library/form-text-field/__snapshots__/form-text-field.test.js.snap
index 465449624..ef767bacc 100644
--- a/ui/components/component-library/form-text-field/__snapshots__/form-text-field.test.js.snap
+++ b/ui/components/component-library/form-text-field/__snapshots__/form-text-field.test.js.snap
@@ -10,7 +10,7 @@ exports[`FormTextField should render correctly 1`] = `
     >
       <input
         autocomplete="off"
-        class="box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-text--color-text-default box--padding-right-4 box--padding-left-4 box--flex-direction-row box--background-color-transparent box--border-style-none"
+        class="box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md box--padding-right-4 box--padding-left-4 box--flex-direction-row box--color-text-default box--background-color-transparent box--border-style-none"
         focused="false"
         type="text"
         value=""
diff --git a/ui/components/component-library/form-text-field/form-text-field.test.js b/ui/components/component-library/form-text-field/form-text-field.test.js
index 5cce40982..3f18643f5 100644
--- a/ui/components/component-library/form-text-field/form-text-field.test.js
+++ b/ui/components/component-library/form-text-field/form-text-field.test.js
@@ -79,9 +79,7 @@ describe('FormTextField', () => {
       />,
     );
     expect(getByTestId('text-field')).toHaveClass('mm-text-field--error');
-    expect(getByText('test help text')).toHaveClass(
-      'mm-text--color-error-default',
-    );
+    expect(getByText('test help text')).toHaveClass('box--color-error-default');
   });
   // helpText
   it('should render with helpText', () => {
diff --git a/ui/components/component-library/help-text/__snapshots__/help-text.test.js.snap b/ui/components/component-library/help-text/__snapshots__/help-text.test.js.snap
index ed326ae49..81e58e095 100644
--- a/ui/components/component-library/help-text/__snapshots__/help-text.test.js.snap
+++ b/ui/components/component-library/help-text/__snapshots__/help-text.test.js.snap
@@ -3,7 +3,7 @@
 exports[`HelpText should match snapshot 1`] = `
 <div>
   <p
-    class="box mm-text mm-help-text mm-text--body-xs mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-help-text mm-text--body-xs box--flex-direction-row box--color-text-default"
   >
     help text
   </p>
diff --git a/ui/components/component-library/help-text/help-text.test.js b/ui/components/component-library/help-text/help-text.test.js
index a57702c08..d5a52c670 100644
--- a/ui/components/component-library/help-text/help-text.test.js
+++ b/ui/components/component-library/help-text/help-text.test.js
@@ -41,10 +41,10 @@ describe('HelpText', () => {
         <HelpText severity={SEVERITIES.INFO}>info</HelpText>
       </>,
     );
-    expect(getByText('error')).toHaveClass('mm-text--color-error-default');
-    expect(getByText('success')).toHaveClass('mm-text--color-success-default');
-    expect(getByText('warning')).toHaveClass('mm-text--color-warning-default');
-    expect(getByText('info')).toHaveClass('mm-text--color-info-default');
+    expect(getByText('error')).toHaveClass('box--color-error-default');
+    expect(getByText('success')).toHaveClass('box--color-success-default');
+    expect(getByText('warning')).toHaveClass('box--color-warning-default');
+    expect(getByText('info')).toHaveClass('box--color-info-default');
   });
   it('should render with different colors', () => {
     const { getByText } = render(
@@ -55,14 +55,12 @@ describe('HelpText', () => {
         <HelpText color={Color.textMuted}>text muted</HelpText>
       </>,
     );
-    expect(getByText('default')).toHaveClass('mm-text--color-text-default');
-    expect(getByText('text default')).toHaveClass(
-      'mm-text--color-text-default',
-    );
+    expect(getByText('default')).toHaveClass('box--color-text-default');
+    expect(getByText('text default')).toHaveClass('box--color-text-default');
     expect(getByText('text alternative')).toHaveClass(
-      'mm-text--color-text-alternative',
+      'box--color-text-alternative',
     );
-    expect(getByText('text muted')).toHaveClass('mm-text--color-text-muted');
+    expect(getByText('text muted')).toHaveClass('box--color-text-muted');
   });
   it('should render with a different html element if children is an object', () => {
     const { getByText, getByTestId } = render(
diff --git a/ui/components/component-library/input/__snapshots__/input.test.js.snap b/ui/components/component-library/input/__snapshots__/input.test.js.snap
index 3f314fa85..4e663724e 100644
--- a/ui/components/component-library/input/__snapshots__/input.test.js.snap
+++ b/ui/components/component-library/input/__snapshots__/input.test.js.snap
@@ -4,7 +4,7 @@ exports[`Input should render correctly 1`] = `
 <div>
   <input
     autocomplete="off"
-    class="box mm-text mm-input mm-text--body-md mm-text--color-text-default box--flex-direction-row box--background-color-transparent box--border-style-none"
+    class="box mm-text mm-input mm-text--body-md box--flex-direction-row box--color-text-default box--background-color-transparent box--border-style-none"
     type="text"
     value=""
   />
diff --git a/ui/components/component-library/label/__snapshots__/label.test.js.snap b/ui/components/component-library/label/__snapshots__/label.test.js.snap
index d0d0d6b3e..f72fcd1f7 100644
--- a/ui/components/component-library/label/__snapshots__/label.test.js.snap
+++ b/ui/components/component-library/label/__snapshots__/label.test.js.snap
@@ -3,7 +3,7 @@
 exports[`label should render text inside the label 1`] = `
 <div>
   <label
-    class="box mm-text mm-label mm-text--body-md mm-text--font-weight-bold mm-text--color-text-default box--display-inline-flex box--flex-direction-row box--align-items-center"
+    class="box mm-text mm-label mm-text--body-md mm-text--font-weight-bold box--display-inline-flex box--flex-direction-row box--align-items-center box--color-text-default"
   >
     label
   </label>
diff --git a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.js.snap b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.js.snap
index bf7783940..d92ee9fef 100644
--- a/ui/components/component-library/picker-network/__snapshots__/picker-network.test.js.snap
+++ b/ui/components/component-library/picker-network/__snapshots__/picker-network.test.js.snap
@@ -7,12 +7,12 @@ exports[`PickerNetwork should render the label inside the PickerNetwork 1`] = `
     data-testid="picker-network"
   >
     <div
-      class="box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
+      class="box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-picker-network__avatar-network mm-text--body-xs mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     >
       I
     </div>
     <p
-      class="box mm-text mm-text--body-sm mm-text--ellipsis mm-text--color-text-default box--flex-direction-row"
+      class="box mm-text mm-text--body-sm mm-text--ellipsis box--flex-direction-row box--color-text-default"
     >
       Imported
     </p>
diff --git a/ui/components/component-library/tag-url/__snapshots__/tag-url.test.js.snap b/ui/components/component-library/tag-url/__snapshots__/tag-url.test.js.snap
index 4169c58f3..ffdde8025 100644
--- a/ui/components/component-library/tag-url/__snapshots__/tag-url.test.js.snap
+++ b/ui/components/component-library/tag-url/__snapshots__/tag-url.test.js.snap
@@ -7,7 +7,7 @@ exports[`TagUrl should render the label inside the TagUrl 1`] = `
     data-testid="tag-url"
   >
     <div
-      class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-favicon mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
+      class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-favicon mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     >
       <span
         class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-icon-default"
@@ -15,7 +15,7 @@ exports[`TagUrl should render the label inside the TagUrl 1`] = `
       />
     </div>
     <p
-      class="box mm-text mm-text--body-md mm-text--ellipsis mm-text--color-text-default box--flex-direction-row"
+      class="box mm-text mm-text--body-md mm-text--ellipsis box--flex-direction-row box--color-text-default"
     >
       https://app.uniswap.org
     </p>
diff --git a/ui/components/component-library/tag/__snapshots__/tag.test.js.snap b/ui/components/component-library/tag/__snapshots__/tag.test.js.snap
index c0c156876..a07e42e0e 100644
--- a/ui/components/component-library/tag/__snapshots__/tag.test.js.snap
+++ b/ui/components/component-library/tag/__snapshots__/tag.test.js.snap
@@ -7,7 +7,7 @@ exports[`Tag should render the label inside the tag and match snapshot 1`] = `
     data-testid="tag"
   >
     <p
-      class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+      class="box mm-text mm-text--body-sm box--flex-direction-row box--color-text-default"
     >
       Imported
     </p>
diff --git a/ui/components/component-library/text-field-search/__snapshots__/text-field-search.test.js.snap b/ui/components/component-library/text-field-search/__snapshots__/text-field-search.test.js.snap
index a84ecf3ea..405e0fd7e 100644
--- a/ui/components/component-library/text-field-search/__snapshots__/text-field-search.test.js.snap
+++ b/ui/components/component-library/text-field-search/__snapshots__/text-field-search.test.js.snap
@@ -11,7 +11,7 @@ exports[`TextFieldSearch should render correctly 1`] = `
     />
     <input
       autocomplete="off"
-      class="box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-text--color-text-default box--margin-right-6 box--padding-right-4 box--padding-left-2 box--flex-direction-row box--background-color-transparent box--border-style-none"
+      class="box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md box--margin-right-6 box--padding-right-4 box--padding-left-2 box--flex-direction-row box--color-text-default box--background-color-transparent box--border-style-none"
       focused="false"
       type="search"
       value=""
diff --git a/ui/components/component-library/text-field/__snapshots__/text-field.test.js.snap b/ui/components/component-library/text-field/__snapshots__/text-field.test.js.snap
index fb40bafa0..b8a4a4b6f 100644
--- a/ui/components/component-library/text-field/__snapshots__/text-field.test.js.snap
+++ b/ui/components/component-library/text-field/__snapshots__/text-field.test.js.snap
@@ -7,7 +7,7 @@ exports[`TextField should render correctly 1`] = `
   >
     <input
       autocomplete="off"
-      class="box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-text--color-text-default box--padding-right-4 box--padding-left-4 box--flex-direction-row box--background-color-transparent box--border-style-none"
+      class="box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md box--padding-right-4 box--padding-left-4 box--flex-direction-row box--color-text-default box--background-color-transparent box--border-style-none"
       focused="false"
       type="text"
       value=""
diff --git a/ui/components/component-library/text/__snapshots__/text.test.js.snap b/ui/components/component-library/text/__snapshots__/text.test.js.snap
index f3a993f50..f9c068518 100644
--- a/ui/components/component-library/text/__snapshots__/text.test.js.snap
+++ b/ui/components/component-library/text/__snapshots__/text.test.js.snap
@@ -3,52 +3,52 @@
 exports[`Text should render the Text with proper variant class name 1`] = `
 <div>
   <h1
-    class="box mm-text mm-text--display-md mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--display-md box--flex-direction-row box--color-text-default"
   >
     display-md
   </h1>
   <h2
-    class="box mm-text mm-text--heading-lg mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--heading-lg box--flex-direction-row box--color-text-default"
   >
     heading-lg
   </h2>
   <h3
-    class="box mm-text mm-text--heading-md mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--heading-md box--flex-direction-row box--color-text-default"
   >
     heading-md
   </h3>
   <h4
-    class="box mm-text mm-text--heading-sm mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--heading-sm box--flex-direction-row box--color-text-default"
   >
     heading-sm
   </h4>
   <p
-    class="box mm-text mm-text--body-lg-medium mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--body-lg-medium box--flex-direction-row box--color-text-default"
   >
     body-lg-medium
   </p>
   <p
-    class="box mm-text mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-default"
   >
     body-md
   </p>
   <p
-    class="box mm-text mm-text--body-md-bold mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--body-md-bold box--flex-direction-row box--color-text-default"
   >
     body-md-bold
   </p>
   <p
-    class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--body-sm box--flex-direction-row box--color-text-default"
   >
     body-sm
   </p>
   <p
-    class="box mm-text mm-text--body-sm-bold mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--body-sm-bold box--flex-direction-row box--color-text-default"
   >
     body-sm-bold
   </p>
   <p
-    class="box mm-text mm-text--body-xs mm-text--color-text-default box--flex-direction-row"
+    class="box mm-text mm-text--body-xs box--flex-direction-row box--color-text-default"
   >
     body-xs
   </p>
diff --git a/ui/components/component-library/text/text.js b/ui/components/component-library/text/text.js
index 4deedec87..6144d3ea0 100644
--- a/ui/components/component-library/text/text.js
+++ b/ui/components/component-library/text/text.js
@@ -89,7 +89,6 @@ export const Text = React.forwardRef(
         [`mm-text--ellipsis`]: Boolean(ellipsis),
         [`mm-text--text-transform-${textTransform}`]: Boolean(textTransform),
         [`mm-text--text-align-${textAlign}`]: Boolean(textAlign),
-        [`mm-text--color-${color}`]: Boolean(color),
         [`mm-text--overflow-wrap-${overflowWrap}`]: Boolean(overflowWrap),
       },
     );
@@ -100,6 +99,7 @@ export const Text = React.forwardRef(
         className={classnames(computedClassName)}
         as={Tag}
         dir={textDirection}
+        color={color}
         {...props}
       >
         {children}
diff --git a/ui/components/component-library/text/text.scss b/ui/components/component-library/text/text.scss
index 58e16c0c5..da77a1f19 100644
--- a/ui/components/component-library/text/text.scss
+++ b/ui/components/component-library/text/text.scss
@@ -46,12 +46,6 @@ $text-variants: (
     }
   }
 
-  @each $variant, $color in $color-map {
-    &--color-#{$variant} {
-      color: var($color);
-    }
-  }
-
   @each $weight in $font-weight {
     &--font-weight-#{$weight} {
       @if $weight == "medium" {
diff --git a/ui/components/component-library/text/text.stories.js b/ui/components/component-library/text/text.stories.js
index da665bb03..3d28c829a 100644
--- a/ui/components/component-library/text/text.stories.js
+++ b/ui/components/component-library/text/text.stories.js
@@ -147,6 +147,15 @@ function renderBackgroundColor(color) {
     case Color.infoInverse:
       bgColor = BackgroundColor.infoDefault;
       break;
+    case Color.goerliInverse:
+      bgColor = BackgroundColor.goerli;
+      break;
+    case Color.sepoliaInverse:
+      bgColor = BackgroundColor.sepolia;
+      break;
+    case Color.lineaTestnetInverse:
+      bgColor = BackgroundColor.lineaTestnet;
+      break;
     default:
       bgColor = null;
       break;
diff --git a/ui/components/component-library/text/text.test.js b/ui/components/component-library/text/text.test.js
index d1385bbc0..a1289a436 100644
--- a/ui/components/component-library/text/text.test.js
+++ b/ui/components/component-library/text/text.test.js
@@ -126,40 +126,30 @@ describe('Text', () => {
         <Text color={TextColor.infoInverse}>info-inverse</Text>
       </>,
     );
-    expect(getByText('text-default')).toHaveClass(
-      'mm-text--color-text-default',
-    );
+    expect(getByText('text-default')).toHaveClass('box--color-text-default');
     expect(getByText('text-alternative')).toHaveClass(
-      'mm-text--color-text-alternative',
+      'box--color-text-alternative',
     );
-    expect(getByText('text-muted')).toHaveClass('mm-text--color-text-muted');
+    expect(getByText('text-muted')).toHaveClass('box--color-text-muted');
     expect(getByText('primary-default')).toHaveClass(
-      'mm-text--color-primary-default',
+      'box--color-primary-default',
     );
     expect(getByText('primary-inverse')).toHaveClass(
-      'mm-text--color-primary-inverse',
-    );
-    expect(getByText('error-default')).toHaveClass(
-      'mm-text--color-error-default',
-    );
-    expect(getByText('error-inverse')).toHaveClass(
-      'mm-text--color-error-inverse',
+      'box--color-primary-inverse',
     );
+    expect(getByText('error-default')).toHaveClass('box--color-error-default');
+    expect(getByText('error-inverse')).toHaveClass('box--color-error-inverse');
     expect(getByText('success-default')).toHaveClass(
-      'mm-text--color-success-default',
+      'box--color-success-default',
     );
     expect(getByText('success-inverse')).toHaveClass(
-      'mm-text--color-success-inverse',
+      'box--color-success-inverse',
     );
     expect(getByText('warning-inverse')).toHaveClass(
-      'mm-text--color-warning-inverse',
-    );
-    expect(getByText('info-default')).toHaveClass(
-      'mm-text--color-info-default',
-    );
-    expect(getByText('info-inverse')).toHaveClass(
-      'mm-text--color-info-inverse',
+      'box--color-warning-inverse',
     );
+    expect(getByText('info-default')).toHaveClass('box--color-info-default');
+    expect(getByText('info-inverse')).toHaveClass('box--color-info-inverse');
   });
 
   it('should render the Text with proper font style class name', () => {
diff --git a/ui/components/institutional/jwt-dropdown/__snapshots__/jwt-dropdown.test.js.snap b/ui/components/institutional/jwt-dropdown/__snapshots__/jwt-dropdown.test.js.snap
index 2612ae47c..c4db9b520 100644
--- a/ui/components/institutional/jwt-dropdown/__snapshots__/jwt-dropdown.test.js.snap
+++ b/ui/components/institutional/jwt-dropdown/__snapshots__/jwt-dropdown.test.js.snap
@@ -6,7 +6,7 @@ exports[`JwtDropdown should render the Jwt dropdown component 1`] = `
     class="box box--flex-direction-row"
   >
     <p
-      class="box mm-text custody-search-jwt__select-title mm-text--body-md mm-text--color-text-default box--padding-1 box--flex-direction-row"
+      class="box mm-text custody-search-jwt__select-title mm-text--body-md box--padding-1 box--flex-direction-row box--color-text-default"
     >
       [selectJWT]
     </p>
diff --git a/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap b/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap
index 2d9c15b48..6c15c0327 100644
--- a/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap
+++ b/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap
@@ -12,7 +12,7 @@ exports[`JwtUrlForm shows JWT text area when no jwt token exists 1`] = `
         class="box box--flex-direction-row"
       >
         <p
-          class="box mm-text jwt-url-form__instruction mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+          class="box mm-text jwt-url-form__instruction mm-text--body-md box--flex-direction-row box--color-text-default"
         >
           input text
         </p>
@@ -28,7 +28,7 @@ exports[`JwtUrlForm shows JWT text area when no jwt token exists 1`] = `
       class="box jwt-url-form__jwt-apiUrlInput box--flex-direction-row"
     >
       <p
-        class="box mm-text jwt-url-form__instruction mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+        class="box mm-text jwt-url-form__instruction mm-text--body-md box--flex-direction-row box--color-text-default"
       />
       <div
         class="box box--flex-direction-row"
diff --git a/ui/components/institutional/note-to-trader/__snapshots__/note-to-trader.test.js.snap b/ui/components/institutional/note-to-trader/__snapshots__/note-to-trader.test.js.snap
index 94a2fff67..73e3cc2dd 100644
--- a/ui/components/institutional/note-to-trader/__snapshots__/note-to-trader.test.js.snap
+++ b/ui/components/institutional/note-to-trader/__snapshots__/note-to-trader.test.js.snap
@@ -6,13 +6,13 @@ exports[`NoteToTrader should render the Note to trader component 1`] = `
     class="box note-header box--display-flex box--flex-direction-row box--justify-content-space-between"
   >
     <label
-      class="box mm-text mm-label mm-label--html-for mm-text--body-md mm-text--font-weight-bold mm-text--color-text-default box--display-inline-flex box--flex-direction-row box--align-items-center"
+      class="box mm-text mm-label mm-label--html-for mm-text--body-md mm-text--font-weight-bold box--display-inline-flex box--flex-direction-row box--align-items-center box--color-text-default"
       for="transaction-note"
     >
       Transaction note
     </label>
     <p
-      class="box mm-text note-header__counter mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+      class="box mm-text note-header__counter mm-text--body-md box--flex-direction-row box--color-text-default"
     >
       9
       /
diff --git a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
index c44eb7029..59d42769f 100644
--- a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
+++ b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
@@ -6,7 +6,7 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
     class="box multichain-account-list-item box--padding-4 box--display-flex box--gap-2 box--flex-direction-row box--background-color-transparent"
   >
     <div
-      class="box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
+      class="box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
     >
       <div
         class="mm-avatar-account__jazzicon"
@@ -58,7 +58,7 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
           class="box box--display-flex box--gap-2 box--flex-direction-row box--justify-content-space-between"
         >
           <div
-            class="box mm-text mm-text--body-md mm-text--ellipsis mm-text--color-text-default box--flex-direction-row"
+            class="box mm-text mm-text--body-md mm-text--ellipsis box--flex-direction-row box--color-text-default"
           >
             Test Account
           </div>
@@ -66,7 +66,7 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
             class="box box--display-flex box--flex-direction-row box--align-items-center"
           >
             <div
-              class="box mm-text mm-text--body-md mm-text--text-align-end mm-text--color-text-default box--flex-direction-row"
+              class="box mm-text mm-text--body-md mm-text--text-align-end box--flex-direction-row box--color-text-default"
             >
               <div
                 class="currency-display-component"
@@ -94,12 +94,12 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
         class="box box--display-flex box--flex-direction-row box--justify-content-space-between"
       >
         <p
-          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--flex-direction-row"
+          class="box mm-text mm-text--body-sm box--flex-direction-row box--color-text-alternative"
         >
           0x0dc...e7bc
         </p>
         <div
-          class="box mm-text mm-text--body-sm mm-text--text-align-end mm-text--color-text-alternative box--flex-direction-row"
+          class="box mm-text mm-text--body-sm mm-text--text-align-end box--flex-direction-row box--color-text-alternative"
         >
           <div
             class="currency-display-component"
diff --git a/ui/components/multichain/detected-token-banner/__snapshots__/detected-token-banner.test.js.snap b/ui/components/multichain/detected-token-banner/__snapshots__/detected-token-banner.test.js.snap
index cbf587cb2..b9be92648 100644
--- a/ui/components/multichain/detected-token-banner/__snapshots__/detected-token-banner.test.js.snap
+++ b/ui/components/multichain/detected-token-banner/__snapshots__/detected-token-banner.test.js.snap
@@ -12,12 +12,12 @@ exports[`DetectedTokensBanner should render correctly 1`] = `
     />
     <div>
       <p
-        class="box mm-text mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+        class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-default"
       >
         3 new tokens found in this account
       </p>
       <button
-        class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+        class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
       >
         Import tokens
       </button>
diff --git a/ui/components/multichain/multichain-import-token-link/__snapshots__/multichain-import-token-link.test.js.snap b/ui/components/multichain/multichain-import-token-link/__snapshots__/multichain-import-token-link.test.js.snap
index 925788efa..5b8d9b685 100644
--- a/ui/components/multichain/multichain-import-token-link/__snapshots__/multichain-import-token-link.test.js.snap
+++ b/ui/components/multichain/multichain-import-token-link/__snapshots__/multichain-import-token-link.test.js.snap
@@ -9,7 +9,7 @@ exports[`Import Token Link should match snapshot for goerli chainId 1`] = `
       class="box box--display-flex box--flex-direction-row box--align-items-center"
     >
       <button
-        class="box mm-text mm-button-base mm-button-base--size-md mm-button-link mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+        class="box mm-text mm-button-base mm-button-base--size-md mm-button-link mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
         data-testid="import-token-button"
       >
         <span
@@ -23,7 +23,7 @@ exports[`Import Token Link should match snapshot for goerli chainId 1`] = `
       class="box box--padding-top-4 box--padding-bottom-4 box--display-flex box--flex-direction-row box--align-items-center"
     >
       <button
-        class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+        class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
         data-testid="refresh-list-button"
       >
         <span
@@ -46,7 +46,7 @@ exports[`Import Token Link should match snapshot for mainnet chainId 1`] = `
       class="box box--display-flex box--flex-direction-row box--align-items-center"
     >
       <button
-        class="box mm-text mm-button-base mm-button-base--size-md mm-button-link mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+        class="box mm-text mm-button-base mm-button-base--size-md mm-button-link mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
         data-testid="import-token-button"
       >
         <span
@@ -60,7 +60,7 @@ exports[`Import Token Link should match snapshot for mainnet chainId 1`] = `
       class="box box--padding-top-4 box--padding-bottom-4 box--display-flex box--flex-direction-row box--align-items-center"
     >
       <button
-        class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+        class="box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
         data-testid="refresh-list-button"
       >
         <span
diff --git a/ui/components/multichain/multichain-token-list-item/__snapshots__/multichain-token-list-item.test.js.snap b/ui/components/multichain/multichain-token-list-item/__snapshots__/multichain-token-list-item.test.js.snap
index b4af82ccb..7ed3f32aa 100644
--- a/ui/components/multichain/multichain-token-list-item/__snapshots__/multichain-token-list-item.test.js.snap
+++ b/ui/components/multichain/multichain-token-list-item/__snapshots__/multichain-token-list-item.test.js.snap
@@ -15,7 +15,7 @@ exports[`MultichainTokenListItem should render correctly 1`] = `
         class="box mm-badge-wrapper box--margin-right-3 box--display-inline-block box--flex-direction-row"
       >
         <div
-          class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
+          class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
         >
           ?
         </div>
@@ -23,7 +23,7 @@ exports[`MultichainTokenListItem should render correctly 1`] = `
           class="box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right box--flex-direction-row"
         >
           <div
-            class="box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-text--color-text-default box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-background-alternative box--rounded-full box--border-color-border-muted box--border-style-solid box--border-width-1"
+            class="box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-border-muted box--border-style-solid box--border-width-1"
           >
             <img
               alt="undefined logo"
@@ -45,16 +45,16 @@ exports[`MultichainTokenListItem should render correctly 1`] = `
           >
             <div>
               <p
-                class="box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-text--color-text-default box--flex-direction-row"
+                class="box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis box--flex-direction-row box--color-text-default"
               />
             </div>
           </div>
           <p
-            class="box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end mm-text--color-text-default box--flex-direction-row"
+            class="box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--text-align-end box--flex-direction-row box--color-text-default"
           />
         </div>
         <p
-          class="box mm-text mm-text--body-md mm-text--color-text-alternative box--flex-direction-row"
+          class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-alternative"
         >
           NaN
            
diff --git a/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap b/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap
index a2c7be080..e7a265e1a 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap
+++ b/ui/pages/confirm-approve/confirm-approve-content/__snapshots__/confirm-approve-content.component.test.js.snap
@@ -21,7 +21,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
           />
         </div>
         <h6
-          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--margin-left-1 box--flex-direction-row"
+          class="box mm-text mm-text--body-sm box--margin-left-1 box--flex-direction-row box--color-text-alternative"
         >
           https://metamask.github.io/test-dapp/
         </h6>
@@ -135,7 +135,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
               class="box confirm-approve-content__custom-nonce-header box--flex-direction-row box--justify-content-flex-start box--display-flex"
             >
               <h6
-                class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+                class="box mm-text mm-text--body-sm box--flex-direction-row box--color-text-default"
               >
                 Nonce
               </h6>
@@ -148,7 +148,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
               </a>
             </div>
             <h6
-              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold mm-text--color-text-default box--flex-direction-row"
+              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold box--flex-direction-row box--color-text-default"
             >
               2
             </h6>
@@ -197,7 +197,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
           />
         </div>
         <h6
-          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--margin-left-1 box--flex-direction-row"
+          class="box mm-text mm-text--body-sm box--margin-left-1 box--flex-direction-row box--color-text-alternative"
         >
           https://metamask.github.io/test-dapp/
         </h6>
@@ -322,7 +322,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
               class="box confirm-approve-content__custom-nonce-header box--flex-direction-row box--justify-content-flex-start box--display-flex"
             >
               <h6
-                class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+                class="box mm-text mm-text--body-sm box--flex-direction-row box--color-text-default"
               >
                 Nonce
               </h6>
@@ -335,7 +335,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
               </a>
             </div>
             <h6
-              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold mm-text--color-text-default box--flex-direction-row"
+              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold box--flex-direction-row box--color-text-default"
             >
               2
             </h6>
@@ -384,7 +384,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
           />
         </div>
         <h6
-          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--margin-left-1 box--flex-direction-row"
+          class="box mm-text mm-text--body-sm box--margin-left-1 box--flex-direction-row box--color-text-alternative"
         >
           https://metamask.github.io/test-dapp/
         </h6>
@@ -509,7 +509,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
               class="box confirm-approve-content__custom-nonce-header box--flex-direction-row box--justify-content-flex-start box--display-flex"
             >
               <h6
-                class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+                class="box mm-text mm-text--body-sm box--flex-direction-row box--color-text-default"
               >
                 Nonce
               </h6>
@@ -522,7 +522,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
               </a>
             </div>
             <h6
-              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold mm-text--color-text-default box--flex-direction-row"
+              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold box--flex-direction-row box--color-text-default"
             >
               2
             </h6>
@@ -571,7 +571,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
           />
         </div>
         <h6
-          class="box mm-text mm-text--body-sm mm-text--color-text-alternative box--margin-left-1 box--flex-direction-row"
+          class="box mm-text mm-text--body-sm box--margin-left-1 box--flex-direction-row box--color-text-alternative"
         >
           https://metamask.github.io/test-dapp/
         </h6>
@@ -696,7 +696,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
               class="box confirm-approve-content__custom-nonce-header box--flex-direction-row box--justify-content-flex-start box--display-flex"
             >
               <h6
-                class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+                class="box mm-text mm-text--body-sm box--flex-direction-row box--color-text-default"
               >
                 Nonce
               </h6>
@@ -709,7 +709,7 @@ exports[`ConfirmApproveContent Component should render Confirm approve page corr
               </a>
             </div>
             <h6
-              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold mm-text--color-text-default box--flex-direction-row"
+              class="box mm-text confirm-approve-content__custom-nonce-value mm-text--body-sm-bold box--flex-direction-row box--color-text-default"
             >
               2
             </h6>
diff --git a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
index c48acbbe6..922adf6c5 100644
--- a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
+++ b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
@@ -254,7 +254,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
           class="confirm-page-container-summary__title"
         >
           <h3
-            class="box mm-text mm-text--heading-md mm-text--font-weight-normal mm-text--ellipsis mm-text--color-text-default box--flex-direction-row"
+            class="box mm-text mm-text--heading-md mm-text--font-weight-normal mm-text--ellipsis box--flex-direction-row box--color-text-default"
           >
             <div
               class="currency-display-component"
diff --git a/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap b/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap
index 5bf39129d..c2776a7c7 100644
--- a/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap
+++ b/ui/pages/keychains/__snapshots__/reveal-seed.test.js.snap
@@ -6,18 +6,18 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
     class="box page-container box--padding-top-8 box--padding-right-4 box--padding-bottom-8 box--padding-left-4 box--gap-4 box--flex-direction-row"
   >
     <h2
-      class="box mm-text mm-text--heading-lg mm-text--color-text-default box--flex-direction-row"
+      class="box mm-text mm-text--heading-lg box--flex-direction-row box--color-text-default"
     >
       Secret Recovery Phrase
     </h2>
     <p
-      class="box mm-text mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+      class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-default"
     >
       <span>
          
         The 
         <a
-          class="box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+          class="box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
           href="https://metamask.zendesk.com/hc/en-us/articles/360060826432-What-is-a-Secret-Recovery-Phrase-and-how-to-keep-your-crypto-wallet-secure"
           rel="noopener noreferrer"
           target="_blank"
@@ -26,7 +26,7 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
         </a>
          provides 
         <strong
-          class="box mm-text mm-text--body-md-bold mm-text--font-weight-bold mm-text--color-text-default box--flex-direction-row"
+          class="box mm-text mm-text--body-md-bold mm-text--font-weight-bold box--flex-direction-row box--color-text-default"
         >
           full access to your wallet and funds.
 
@@ -36,13 +36,13 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
       </span>
     </p>
     <p
-      class="box mm-text mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+      class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-default"
     >
       <span>
          
         MetaMask is a 
         <a
-          class="box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md mm-text--color-primary-default box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-transparent"
+          class="box mm-text mm-button-base mm-button-link mm-button-link--size-inherit mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
           href="https://metamask.zendesk.com/hc/en-us/articles/360059952212-MetaMask-is-a-non-custodial-wallet"
           rel="noopener noreferrer"
           target="_blank"
@@ -62,13 +62,13 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
       />
       <div>
         <p
-          class="box mm-text mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+          class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-default"
         >
           <span>
              
             Make sure no one is looking at your screen. 
             <strong
-              class="box mm-text mm-text--body-md-bold mm-text--font-weight-bold mm-text--color-text-default box--flex-direction-row"
+              class="box mm-text mm-text--body-md-bold mm-text--font-weight-bold box--flex-direction-row box--color-text-default"
             >
               MetaMask Support will never request this.
             </strong>
@@ -80,7 +80,7 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
     </div>
     <form>
       <label
-        class="box mm-text mm-label mm-label--html-for mm-text--body-md mm-text--font-weight-bold mm-text--color-text-default box--display-inline-flex box--flex-direction-row box--align-items-center"
+        class="box mm-text mm-label mm-label--html-for mm-text--body-md mm-text--font-weight-bold box--display-inline-flex box--flex-direction-row box--align-items-center box--color-text-default"
         for="password-box"
       >
         Enter password to continue
@@ -90,7 +90,7 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
       >
         <input
           autocomplete="off"
-          class="box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md mm-text--color-text-default box--padding-right-4 box--padding-left-4 box--flex-direction-row box--background-color-transparent box--border-style-none"
+          class="box mm-text mm-input mm-input--disable-state-styles mm-text-field__input mm-text--body-md box--padding-right-4 box--padding-left-4 box--flex-direction-row box--color-text-default box--background-color-transparent box--border-style-none"
           data-testid="input-password"
           focused="true"
           id="password-box"
@@ -104,12 +104,12 @@ exports[`Reveal Seed Page should match snapshot 1`] = `
       class="box box--margin-top-auto box--display-flex box--gap-4 box--flex-direction-row"
     >
       <button
-        class="box mm-text mm-button-base mm-button-base--size-lg mm-button-secondary mm-text--body-md mm-text--color-primary-default box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--width-full box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
+        class="box mm-text mm-button-base mm-button-base--size-lg mm-button-secondary mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--width-full box--color-primary-default box--background-color-transparent box--rounded-pill box--border-color-primary-default box--border-style-solid box--border-width-1"
       >
         Cancel
       </button>
       <button
-        class="box mm-text mm-button-base mm-button-base--size-lg mm-button-base--disabled mm-button-primary mm-button-primary--disabled mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--width-full box--background-color-primary-default box--rounded-pill"
+        class="box mm-text mm-button-base mm-button-base--size-lg mm-button-base--disabled mm-button-primary mm-button-primary--disabled mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--width-full box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
         disabled=""
       >
         Next
diff --git a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap
index d212aff5f..afdb27a43 100644
--- a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap
+++ b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap
@@ -177,7 +177,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
           class="settings-page__content-description"
         >
           <p
-            class="box mm-text mm-text--body-md mm-text--color-text-alternative box--flex-direction-row"
+            class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-alternative"
           >
             We use third-party APIs to detect NFTs in your wallet, which means your IP address may be exposed to centralized servers. There are a few things to be cautious about when enabling this feature.
           </p>
@@ -195,7 +195,7 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
             </li>
           </ul>
           <p
-            class="box mm-text mm-text--body-md mm-text--color-text-alternative box--padding-top-4 box--flex-direction-row"
+            class="box mm-text mm-text--body-md box--padding-top-4 box--flex-direction-row box--color-text-alternative"
           >
             Leave this feature off if you don't want the app to pull data from those services.
           </p>

From 4179ce634cab63a03524c3694839eea420d2356c Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Fri, 24 Mar 2023 17:16:46 +0100
Subject: [PATCH 069/129] [FLASK] Update snap authorship component (#18262)

* Create new snap authorship component

* Add icons and fix overflow issues

* Add empty state + more fixes

* Fix overflow

* Move some code to SnapAvatar

* Fix lint

* Change component name

* Delete forgotten file
---
 ui/components/app/app-components.scss         |   1 -
 .../app/flask/snap-authorship/index.js        |   1 +
 .../flask/snap-authorship/snap-authorship.js  | 106 ++++++++++++++++++
 .../snap-authorship.stories.js}               |   8 +-
 ui/components/app/flask/snap-avatar/index.js  |   1 +
 .../app/flask/snap-avatar/snap-avatar.js      |  81 +++++++++++++
 .../flask/snap-avatar/snap-avatar.stories.js  |  21 ++++
 .../app/flask/snaps-authorship-pill/index.js  |   1 -
 .../flask/snaps-authorship-pill/index.scss    |  37 ------
 .../snaps-authorship-pill.js                  | 100 -----------------
 .../permissions-connect-header.component.js   |   7 +-
 ui/helpers/utils/util.js                      |  10 +-
 .../flask/snap-install/snap-install.js        |   7 +-
 .../flask/snap-result/snap-result.js          |   7 +-
 .../flask/snap-update/snap-update.js          |   7 +-
 .../settings/flask/view-snap/view-snap.js     |   4 +-
 16 files changed, 232 insertions(+), 167 deletions(-)
 create mode 100644 ui/components/app/flask/snap-authorship/index.js
 create mode 100644 ui/components/app/flask/snap-authorship/snap-authorship.js
 rename ui/components/app/flask/{snaps-authorship-pill/snaps-authorship-pill.stories.js => snap-authorship/snap-authorship.stories.js} (52%)
 create mode 100644 ui/components/app/flask/snap-avatar/index.js
 create mode 100644 ui/components/app/flask/snap-avatar/snap-avatar.js
 create mode 100644 ui/components/app/flask/snap-avatar/snap-avatar.stories.js
 delete mode 100644 ui/components/app/flask/snaps-authorship-pill/index.js
 delete mode 100644 ui/components/app/flask/snaps-authorship-pill/index.scss
 delete mode 100644 ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js

diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss
index 7cf61bbcf..9659eaad3 100644
--- a/ui/components/app/app-components.scss
+++ b/ui/components/app/app-components.scss
@@ -34,7 +34,6 @@
 @import 'edit-gas-fee-popover/network-statistics/status-slider/index';
 @import 'edit-gas-fee-popover/edit-gas-tooltip/index';
 @import 'flask/experimental-area/index';
-@import 'flask/snaps-authorship-pill/index';
 @import 'flask/snap-content-footer/index';
 @import 'flask/snap-install-warning/index';
 @import 'flask/snap-remove-warning/index';
diff --git a/ui/components/app/flask/snap-authorship/index.js b/ui/components/app/flask/snap-authorship/index.js
new file mode 100644
index 000000000..8dc331ebe
--- /dev/null
+++ b/ui/components/app/flask/snap-authorship/index.js
@@ -0,0 +1 @@
+export { default } from './snap-authorship';
diff --git a/ui/components/app/flask/snap-authorship/snap-authorship.js b/ui/components/app/flask/snap-authorship/snap-authorship.js
new file mode 100644
index 000000000..4179c5cbf
--- /dev/null
+++ b/ui/components/app/flask/snap-authorship/snap-authorship.js
@@ -0,0 +1,106 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import { getSnapPrefix } from '@metamask/snaps-utils';
+import { useSelector } from 'react-redux';
+import Box from '../../../ui/box';
+import {
+  BackgroundColor,
+  TextColor,
+  IconColor,
+  FLEX_DIRECTION,
+  TextVariant,
+  BorderColor,
+  AlignItems,
+  DISPLAY,
+  BorderRadius,
+} from '../../../../helpers/constants/design-system';
+import {
+  getSnapName,
+  removeSnapIdPrefix,
+} from '../../../../helpers/utils/util';
+import {
+  ICON_NAMES,
+  ICON_SIZES,
+  Text,
+  ButtonIcon,
+} from '../../../component-library';
+import { getTargetSubjectMetadata } from '../../../../selectors';
+import SnapAvatar from '../snap-avatar';
+
+const SnapAuthorship = ({ snapId, className }) => {
+  // We're using optional chaining with snapId, because with the current implementation
+  // of snap update in the snap controller, we do not have reference to snapId when an
+  // update request is rejected because the reference comes from the request itself and not subject metadata
+  // like it is done with snap install
+  const snapPrefix = snapId && getSnapPrefix(snapId);
+  const packageName = snapId && removeSnapIdPrefix(snapId);
+  const isNPM = snapPrefix === 'npm:';
+  const url = isNPM
+    ? `https://www.npmjs.com/package/${packageName}`
+    : packageName;
+
+  const subjectMetadata = useSelector((state) =>
+    getTargetSubjectMetadata(state, snapId),
+  );
+
+  const friendlyName = snapId && getSnapName(snapId, subjectMetadata);
+
+  return (
+    <Box
+      className={classnames('snaps-authorship', className)}
+      backgroundColor={BackgroundColor.backgroundDefault}
+      borderColor={BorderColor.borderDefault}
+      borderWidth={1}
+      alignItems={AlignItems.center}
+      paddingLeft={2}
+      paddingTop={2}
+      paddingBottom={2}
+      paddingRight={4}
+      borderRadius={BorderRadius.pill}
+      display={DISPLAY.FLEX}
+      style={{ maxWidth: 'fit-content', width: '100%' }}
+    >
+      <Box>
+        <SnapAvatar snapId={snapId} />
+      </Box>
+      <Box
+        marginLeft={4}
+        marginRight={2}
+        display={DISPLAY.FLEX}
+        flexDirection={FLEX_DIRECTION.COLUMN}
+        style={{ overflow: 'hidden' }}
+      >
+        <Text ellipsis>{friendlyName}</Text>
+        <Text
+          ellipsis
+          variant={TextVariant.bodySm}
+          color={TextColor.textAlternative}
+        >
+          {packageName}
+        </Text>
+      </Box>
+      <ButtonIcon
+        rel="noopener noreferrer"
+        target="_blank"
+        href={url}
+        iconName={ICON_NAMES.EXPORT}
+        color={IconColor.infoDefault}
+        size={ICON_SIZES.MD}
+      />
+    </Box>
+  );
+};
+
+SnapAuthorship.propTypes = {
+  /**
+   * The id of the snap
+   */
+  snapId: PropTypes.string,
+  /**
+   * The className of the SnapAuthorship
+   */
+  className: PropTypes.string,
+};
+
+export default SnapAuthorship;
diff --git a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js b/ui/components/app/flask/snap-authorship/snap-authorship.stories.js
similarity index 52%
rename from ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js
rename to ui/components/app/flask/snap-authorship/snap-authorship.stories.js
index 79be8d7c5..0b1910943 100644
--- a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js
+++ b/ui/components/app/flask/snap-authorship/snap-authorship.stories.js
@@ -1,10 +1,10 @@
 import React from 'react';
-import SnapsAuthorshipPill from '.';
+import SnapAuthorship from '.';
 
 export default {
-  title: 'Components/App/Flask/SnapsAuthorshipPill',
+  title: 'Components/App/Flask/SnapAuthorship',
 
-  component: SnapsAuthorshipPill,
+  component: SnapAuthorship,
   argTypes: {
     snapId: {
       control: 'text',
@@ -12,7 +12,7 @@ export default {
   },
 };
 
-export const DefaultStory = (args) => <SnapsAuthorshipPill {...args} />;
+export const DefaultStory = (args) => <SnapAuthorship {...args} />;
 
 DefaultStory.storyName = 'Default';
 
diff --git a/ui/components/app/flask/snap-avatar/index.js b/ui/components/app/flask/snap-avatar/index.js
new file mode 100644
index 000000000..2c17e12d5
--- /dev/null
+++ b/ui/components/app/flask/snap-avatar/index.js
@@ -0,0 +1 @@
+export { default } from './snap-avatar';
diff --git a/ui/components/app/flask/snap-avatar/snap-avatar.js b/ui/components/app/flask/snap-avatar/snap-avatar.js
new file mode 100644
index 000000000..9a96527cc
--- /dev/null
+++ b/ui/components/app/flask/snap-avatar/snap-avatar.js
@@ -0,0 +1,81 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import { useSelector } from 'react-redux';
+import {
+  TextColor,
+  IconColor,
+  AlignItems,
+  DISPLAY,
+  JustifyContent,
+  Size,
+} from '../../../../helpers/constants/design-system';
+import { getSnapName } from '../../../../helpers/utils/util';
+import {
+  AvatarFavicon,
+  BadgeWrapper,
+  BadgeWrapperPosition,
+  ICON_NAMES,
+  ICON_SIZES,
+  AvatarIcon,
+  AvatarBase,
+} from '../../../component-library';
+import { getTargetSubjectMetadata } from '../../../../selectors';
+
+const SnapAvatar = ({ snapId, className }) => {
+  const subjectMetadata = useSelector((state) =>
+    getTargetSubjectMetadata(state, snapId),
+  );
+
+  const friendlyName = snapId && getSnapName(snapId, subjectMetadata);
+
+  const iconUrl = subjectMetadata?.iconUrl;
+
+  const fallbackIcon = friendlyName && friendlyName[0] ? friendlyName[0] : '?';
+
+  return (
+    <BadgeWrapper
+      className={classnames('snap-avatar', className)}
+      badge={
+        <AvatarIcon
+          iconName={ICON_NAMES.SNAPS}
+          size={ICON_SIZES.XS}
+          backgroundColor={IconColor.infoDefault}
+          iconProps={{
+            size: ICON_SIZES.XS,
+            color: IconColor.infoInverse,
+          }}
+        />
+      }
+      position={BadgeWrapperPosition.bottomRight}
+    >
+      {iconUrl ? (
+        <AvatarFavicon size={Size.LG} src={iconUrl} />
+      ) : (
+        <AvatarBase
+          size={Size.LG}
+          display={DISPLAY.FLEX}
+          alignItems={AlignItems.center}
+          justifyContent={JustifyContent.center}
+          color={TextColor.textAlternative}
+          style={{ borderWidth: '0px' }}
+        >
+          {fallbackIcon}
+        </AvatarBase>
+      )}
+    </BadgeWrapper>
+  );
+};
+
+SnapAvatar.propTypes = {
+  /**
+   * The id of the snap
+   */
+  snapId: PropTypes.string,
+  /**
+   * The className of the SnapAvatar
+   */
+  className: PropTypes.string,
+};
+
+export default SnapAvatar;
diff --git a/ui/components/app/flask/snap-avatar/snap-avatar.stories.js b/ui/components/app/flask/snap-avatar/snap-avatar.stories.js
new file mode 100644
index 000000000..94b134660
--- /dev/null
+++ b/ui/components/app/flask/snap-avatar/snap-avatar.stories.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import SnapAvatar from '.';
+
+export default {
+  title: 'Components/App/Flask/SnapAvatar',
+
+  component: SnapAvatar,
+  argTypes: {
+    snapId: {
+      control: 'text',
+    },
+  },
+};
+
+export const DefaultStory = (args) => <SnapAvatar {...args} />;
+
+DefaultStory.storyName = 'Default';
+
+DefaultStory.args = {
+  snapId: 'npm:@metamask/test-snap-bip44',
+};
diff --git a/ui/components/app/flask/snaps-authorship-pill/index.js b/ui/components/app/flask/snaps-authorship-pill/index.js
deleted file mode 100644
index 79acafe31..000000000
--- a/ui/components/app/flask/snaps-authorship-pill/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './snaps-authorship-pill';
diff --git a/ui/components/app/flask/snaps-authorship-pill/index.scss b/ui/components/app/flask/snaps-authorship-pill/index.scss
deleted file mode 100644
index a2e0a49e2..000000000
--- a/ui/components/app/flask/snaps-authorship-pill/index.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-@import "design-system";
-
-.snaps-authorship-pill {
-  display: inline-block;
-
-  .chip {
-    padding-right: 8px;
-    margin-top: 4px;
-  }
-
-  .chip__label {
-    max-width: 168px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-  }
-
-  &:hover,
-  &:focus {
-    .chip {
-      background-color: var(--color-background-default-hover);
-    }
-  }
-}
-
-.snaps-authorship-icon {
-  color: var(--color-icon-alternative);
-}
-
-.snaps-authorship-version {
-  border-radius: 100px;
-  line-height: 100%;
-}
-
-.snaps-authorship-version > span {
-  vertical-align: middle;
-}
diff --git a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
deleted file mode 100644
index 826f9c3ff..000000000
--- a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import { getSnapPrefix } from '@metamask/snaps-utils';
-import Chip from '../../../ui/chip';
-import Box from '../../../ui/box';
-import Typography from '../../../ui/typography';
-import {
-  TypographyVariant,
-  TEXT_ALIGN,
-  BackgroundColor,
-  TextColor,
-} from '../../../../helpers/constants/design-system';
-import { useI18nContext } from '../../../../hooks/useI18nContext';
-import {
-  getSnapName,
-  removeSnapIdPrefix,
-} from '../../../../helpers/utils/util';
-
-const SnapsAuthorshipPill = ({ snapId, version, className }) => {
-  // We're using optional chaining with snapId, because with the current implementation
-  // of snap update in the snap controller, we do not have reference to snapId when an
-  // update request is rejected because the reference comes from the request itself and not subject metadata
-  // like it is done with snap install
-  const snapPrefix = snapId && getSnapPrefix(snapId);
-  const packageName = snapId && removeSnapIdPrefix(snapId);
-  const isNPM = snapPrefix === 'npm:';
-  const url = isNPM
-    ? `https://www.npmjs.com/package/${packageName}`
-    : packageName;
-  const icon = isNPM ? 'fab fa-npm fa-lg' : 'fas fa-code';
-  const t = useI18nContext();
-
-  const friendlyName = getSnapName(snapId);
-
-  return (
-    <a
-      href={url}
-      target="_blank"
-      rel="noopener noreferrer"
-      className={classnames(className, `snaps-authorship-pill`)}
-    >
-      <Chip
-        leftIcon={
-          <Box paddingLeft={2}>
-            <i className={`${icon} snaps-authorship-icon`} />
-          </Box>
-        }
-        rightIcon={
-          version && (
-            <Box
-              className="snaps-authorship-version"
-              backgroundColor={BackgroundColor.primaryDefault}
-              paddingLeft={2}
-              paddingRight={2}
-            >
-              <Typography
-                color={TextColor.primaryInverse}
-                variant={TypographyVariant.H7}
-                align={TEXT_ALIGN.CENTER}
-                as="span"
-                className="version"
-              >
-                {t('shorthandVersion', [version])}
-              </Typography>
-            </Box>
-          )
-        }
-        backgroundColor={BackgroundColor.backgroundDefault}
-      >
-        <Typography
-          className="chip__label"
-          variant={TypographyVariant.H7}
-          as="span"
-          color={TextColor.textAlternative}
-          title={friendlyName}
-        >
-          {friendlyName}
-        </Typography>
-      </Chip>
-    </a>
-  );
-};
-
-SnapsAuthorshipPill.propTypes = {
-  /**
-   * The id of the snap
-   */
-  snapId: PropTypes.string,
-  /**
-   * The version of the snap
-   */
-  version: PropTypes.string,
-  /**
-   * The className of the SnapsAuthorshipPill
-   */
-  className: PropTypes.string,
-};
-
-export default SnapsAuthorshipPill;
diff --git a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
index 43b6d5f7e..9b7fa112e 100644
--- a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
+++ b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
@@ -8,7 +8,7 @@ import {
   JustifyContent,
 } from '../../../helpers/constants/design-system';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
-import SnapsAuthorshipPill from '../flask/snaps-authorship-pill';
+import SnapAuthorship from '../flask/snap-authorship';
 ///: END:ONLY_INCLUDE_IN
 
 export default class PermissionsConnectHeader extends Component {
@@ -82,7 +82,6 @@ export default class PermissionsConnectHeader extends Component {
       headerText,
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
       siteOrigin,
-      snapVersion,
       isSnapInstallOrUpdate,
       ///: END:ONLY_INCLUDE_IN
     } = this.props;
@@ -97,9 +96,7 @@ export default class PermissionsConnectHeader extends Component {
         <div className="permissions-connect-header__title">{headerTitle}</div>
         {
           ///: BEGIN:ONLY_INCLUDE_IN(flask)
-          isSnapInstallOrUpdate && (
-            <SnapsAuthorshipPill snapId={siteOrigin} version={snapVersion} />
-          )
+          isSnapInstallOrUpdate && <SnapAuthorship snapId={siteOrigin} />
           ///: END:ONLY_INCLUDE_IN
         }
         <div className="permissions-connect-header__subtitle">{headerText}</div>
diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index 8598260d4..c82988d73 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -558,8 +558,14 @@ export function getSnapDerivationPathName(path, curve) {
 export const removeSnapIdPrefix = (snapId) =>
   snapId.replace(getSnapPrefix(snapId), '');
 
-export const getSnapName = (snapId) =>
-  SNAPS_METADATA[snapId]?.name ?? removeSnapIdPrefix(snapId);
+export const getSnapName = (snapId, subjectMetadata) => {
+  if (SNAPS_METADATA[snapId]?.name) {
+    return SNAPS_METADATA[snapId].name;
+  }
+
+  return subjectMetadata?.name ?? removeSnapIdPrefix(snapId);
+};
+
 ///: END:ONLY_INCLUDE_IN
 
 /**
diff --git a/ui/pages/permissions-connect/flask/snap-install/snap-install.js b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
index 2fbc724d7..6224155b6 100644
--- a/ui/pages/permissions-connect/flask/snap-install/snap-install.js
+++ b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
@@ -17,7 +17,7 @@ import {
 import { getSnapInstallWarnings } from '../util';
 import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader';
 import InstallError from '../../../../components/app/flask/install-error/install-error';
-import SnapsAuthorshipPill from '../../../../components/app/flask/snaps-authorship-pill/snaps-authorship-pill';
+import SnapAuthorship from '../../../../components/app/flask/snap-authorship';
 import { Text } from '../../../../components/component-library';
 import { useOriginMetadata } from '../../../../hooks/useOriginMetadata';
 import { getSnapName } from '../../../../helpers/utils/util';
@@ -88,10 +88,7 @@ export default function SnapInstall({
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <SnapsAuthorshipPill
-          snapId={targetSubjectMetadata.origin}
-          version={targetSubjectMetadata.version}
-        />
+        <SnapAuthorship snapId={targetSubjectMetadata.origin} />
         {!hasError && (
           <Text padding={[4, 4, 0, 4]} variant={TextVariant.headingLg}>
             {t('snapInstall')}
diff --git a/ui/pages/permissions-connect/flask/snap-result/snap-result.js b/ui/pages/permissions-connect/flask/snap-result/snap-result.js
index ffb55e5e1..08e702097 100644
--- a/ui/pages/permissions-connect/flask/snap-result/snap-result.js
+++ b/ui/pages/permissions-connect/flask/snap-result/snap-result.js
@@ -17,7 +17,7 @@ import {
 import { Text } from '../../../../components/component-library';
 import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader';
 import InstallError from '../../../../components/app/flask/install-error/install-error';
-import SnapsAuthorshipPill from '../../../../components/app/flask/snaps-authorship-pill/snaps-authorship-pill';
+import SnapAuthorship from '../../../../components/app/flask/snap-authorship';
 import { getSnapName } from '../../../../helpers/utils/util';
 
 export default function SnapResult({
@@ -52,10 +52,7 @@ export default function SnapResult({
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <SnapsAuthorshipPill
-          snapId={targetSubjectMetadata.origin}
-          version={targetSubjectMetadata.version}
-        />
+        <SnapAuthorship snapId={targetSubjectMetadata.origin} />
         {isLoading && (
           <Box
             className="loader-container"
diff --git a/ui/pages/permissions-connect/flask/snap-update/snap-update.js b/ui/pages/permissions-connect/flask/snap-update/snap-update.js
index 6c6110926..9630ad042 100644
--- a/ui/pages/permissions-connect/flask/snap-update/snap-update.js
+++ b/ui/pages/permissions-connect/flask/snap-update/snap-update.js
@@ -18,7 +18,7 @@ import UpdateSnapPermissionList from '../../../../components/app/flask/update-sn
 import { getSnapInstallWarnings } from '../util';
 import PulseLoader from '../../../../components/ui/pulse-loader/pulse-loader';
 import InstallError from '../../../../components/app/flask/install-error/install-error';
-import SnapsAuthorshipPill from '../../../../components/app/flask/snaps-authorship-pill/snaps-authorship-pill';
+import SnapAuthorship from '../../../../components/app/flask/snap-authorship';
 import { Text } from '../../../../components/component-library';
 import { useOriginMetadata } from '../../../../hooks/useOriginMetadata';
 import { getSnapName } from '../../../../helpers/utils/util';
@@ -94,10 +94,7 @@ export default function SnapUpdate({
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <SnapsAuthorshipPill
-          snapId={targetSubjectMetadata.origin}
-          version={requestState.newVersion}
-        />
+        <SnapAuthorship snapId={targetSubjectMetadata.origin} />
         {!hasError && (
           <Text padding={[4, 4, 0, 4]} variant={TextVariant.headingLg}>
             {t('snapUpdate')}
diff --git a/ui/pages/settings/flask/view-snap/view-snap.js b/ui/pages/settings/flask/view-snap/view-snap.js
index 33e7f7001..42ac59c8c 100644
--- a/ui/pages/settings/flask/view-snap/view-snap.js
+++ b/ui/pages/settings/flask/view-snap/view-snap.js
@@ -14,7 +14,7 @@ import {
   FRACTIONS,
   TextColor,
 } from '../../../../helpers/constants/design-system';
-import SnapsAuthorshipPill from '../../../../components/app/flask/snaps-authorship-pill';
+import SnapAuthorship from '../../../../components/app/flask/snap-authorship';
 import Box from '../../../../components/ui/box';
 import SnapRemoveWarning from '../../../../components/app/flask/snap-remove-warning';
 import ToggleButton from '../../../../components/ui/toggle-button';
@@ -118,7 +118,7 @@ function ViewSnap() {
           </Typography>
           <Box className="view-snap__pill-toggle-container">
             <Box className="view-snap__pill-container" paddingLeft={2}>
-              <SnapsAuthorshipPill snapId={snap.id} />
+              <SnapAuthorship snapId={snap.id} />
             </Box>
             <Box paddingLeft={4} className="view-snap__toggle-container">
               <Tooltip interactive position="bottom" html={t('snapsToggle')}>

From 0f1b86a037d946141193ffec6829b99e75d40e8d Mon Sep 17 00:00:00 2001
From: aleksandar-mihajlovic
 <120601632+aleksandar-mihajlovic@users.noreply.github.com>
Date: Mon, 27 Mar 2023 08:45:17 +0200
Subject: [PATCH 070/129] Removed advanced gas controls from the settings
 (#18138)

---
 app/_locales/am/messages.json                 |  6 ---
 app/_locales/ar/messages.json                 |  6 ---
 app/_locales/bg/messages.json                 |  6 ---
 app/_locales/bn/messages.json                 |  6 ---
 app/_locales/ca/messages.json                 |  6 ---
 app/_locales/da/messages.json                 |  6 ---
 app/_locales/de/messages.json                 |  6 ---
 app/_locales/el/messages.json                 |  6 ---
 app/_locales/en/messages.json                 |  6 ---
 app/_locales/es/messages.json                 |  6 ---
 app/_locales/es_419/messages.json             |  6 ---
 app/_locales/et/messages.json                 |  6 ---
 app/_locales/fa/messages.json                 |  6 ---
 app/_locales/fi/messages.json                 |  6 ---
 app/_locales/fil/messages.json                |  6 ---
 app/_locales/fr/messages.json                 |  6 ---
 app/_locales/he/messages.json                 |  6 ---
 app/_locales/hi/messages.json                 |  6 ---
 app/_locales/hr/messages.json                 |  6 ---
 app/_locales/hu/messages.json                 |  6 ---
 app/_locales/id/messages.json                 |  6 ---
 app/_locales/it/messages.json                 |  6 ---
 app/_locales/ja/messages.json                 |  6 ---
 app/_locales/kn/messages.json                 |  6 ---
 app/_locales/ko/messages.json                 |  6 ---
 app/_locales/lt/messages.json                 |  6 ---
 app/_locales/lv/messages.json                 |  6 ---
 app/_locales/ms/messages.json                 |  6 ---
 app/_locales/no/messages.json                 |  6 ---
 app/_locales/ph/messages.json                 |  6 ---
 app/_locales/pl/messages.json                 |  6 ---
 app/_locales/pt/messages.json                 |  6 ---
 app/_locales/pt_BR/messages.json              |  6 ---
 app/_locales/ro/messages.json                 |  6 ---
 app/_locales/ru/messages.json                 |  6 ---
 app/_locales/sk/messages.json                 |  6 ---
 app/_locales/sl/messages.json                 |  6 ---
 app/_locales/sr/messages.json                 |  6 ---
 app/_locales/sv/messages.json                 |  6 ---
 app/_locales/sw/messages.json                 |  6 ---
 app/_locales/th/messages.json                 |  3 --
 app/_locales/tl/messages.json                 |  6 ---
 app/_locales/tr/messages.json                 |  6 ---
 app/_locales/uk/messages.json                 |  6 ---
 app/_locales/vi/messages.json                 |  6 ---
 app/_locales/zh_CN/messages.json              |  6 ---
 app/_locales/zh_TW/messages.json              |  6 ---
 ui/helpers/constants/settings.js              |  7 ---
 ui/helpers/utils/settings-search.test.js      |  4 +-
 .../advanced-tab/advanced-tab.component.js    | 47 +++----------------
 .../advanced-tab.component.test.js            |  2 +-
 .../advanced-tab/advanced-tab.container.js    |  5 +-
 .../advanced-tab/advanced-tab.stories.js      | 14 ------
 53 files changed, 10 insertions(+), 348 deletions(-)

diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index 1d11f9a35..f059d1a67 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -663,12 +663,6 @@
   "settings": {
     "message": "ቅንብሮች"
   },
-  "showAdvancedGasInline": {
-    "message": "የላቁ የነዳጅ ቁጥጥሮች"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "በላክ እና አረጋግጥ ማያዎች ላይ የነዳጅ ዋጋን ለማሳየትና ቁጥጥሮችን ለመገደብ ይህን ይምረጡ።"
-  },
   "showFiatConversionInTestnets": {
     "message": "ልወጣን በ Testnets ላይ አሳይ"
   },
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index aac31f246..b9e3782be 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -675,12 +675,6 @@
   "settings": {
     "message": "الإعدادات"
   },
-  "showAdvancedGasInline": {
-    "message": "أدوات التحكم المتقدمة للغاز"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "حدد هذا لإظهار سعر عملة جاس والحد من الضوابط مباشرة على شاشات الإرسال والتأكيد."
-  },
   "showFiatConversionInTestnets": {
     "message": "عرض التحويل على Testnets"
   },
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index eea674ea6..80f5990d6 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -674,12 +674,6 @@
   "settings": {
     "message": "Настройки"
   },
-  "showAdvancedGasInline": {
-    "message": "Разширено управление на газа"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Изберете това, за да покажете цените на газа и ограничите контрола директно на екраните за изпращане и потвърждение."
-  },
   "showFiatConversionInTestnets": {
     "message": "Показване на преобразуването на Testnets"
   },
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index 736c1f72f..d0efb575a 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -672,12 +672,6 @@
   "settings": {
     "message": "সেটিংস"
   },
-  "showAdvancedGasInline": {
-    "message": "উন্নত গ্যাস নিয়ন্ত্রণসমূহ"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "গ্যাসের মূল্য দেখাতে এটি নির্বাচন করুন এবং পাঠানোর এবং নিশ্চিতকরণের স্ক্রিনগুলিতে নিয়ন্ত্রণগুলি সরাসরি সীমিত করুন।"
-  },
   "showFiatConversionInTestnets": {
     "message": "Testnets এ রূপান্তর দেখান"
   },
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index c382f3619..bae6a1d6a 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -656,12 +656,6 @@
   "settings": {
     "message": "Configuració"
   },
-  "showAdvancedGasInline": {
-    "message": "Controls de gas avançats"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Selecciona això per a mostrar el preu del gas i els controls de límit directament a les pantalles d'enviament i confirmació."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostra Conversió a Testnets"
   },
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index 68974f4e7..5c8056d60 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -656,12 +656,6 @@
   "settings": {
     "message": "Indstillinger "
   },
-  "showAdvancedGasInline": {
-    "message": "Avanceret Gas-styring"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Vælg dette for at vise brændstofprisen og begræns styringen direkte på afsendelses- og bekræftelseskærmene."
-  },
   "showFiatConversionInTestnets": {
     "message": "Vis konvertering på testnet"
   },
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index a920e0116..125c3b7de 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Zeigen"
   },
-  "showAdvancedGasInline": {
-    "message": "Erweiterte Gaskontrollen"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Wählen Sie dies aus, um den Gaspreis und die Limitkontrollen direkt auf den Senden- und Bestätigen-Bildschirmen anzuzeigen."
-  },
   "showFiatConversionInTestnets": {
     "message": "Umwandlung auf Testnets anzeigen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 6a97d9d71..c546cc525 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Εμφάνιση"
   },
-  "showAdvancedGasInline": {
-    "message": "Προωθημένος έλεγχος gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Επιλέξτε αυτό για να εμφανίσετε τις τιμές αερίου και να περιορίσετε τα στοιχεία ελέγχου απευθείας στις οθόνες αποστολής και επιβεβαίωσης."
-  },
   "showFiatConversionInTestnets": {
     "message": "Εμφάνιση Μετατροπής σε Δοκιμαστικά Δίκτυα"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 1aca00b81..5770bc805 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3423,12 +3423,6 @@
   "show": {
     "message": "Show"
   },
-  "showAdvancedGasInline": {
-    "message": "Advanced gas controls"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Select this to show gas price and limit controls directly on the send and confirm screens."
-  },
   "showFiatConversionInTestnets": {
     "message": "Show conversion on test networks"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index a2dc1a9fe..97a44bba6 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Mostrar"
   },
-  "showAdvancedGasInline": {
-    "message": "Controles avanzados de gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Seleccione esta opción para mostrar el precio del gas y limitar los controles directamente en las pantallas de envío y confirmación."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostrar conversión en redes de prueba"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 5e90a0c91..acf0766c9 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -2070,12 +2070,6 @@
   "show": {
     "message": "Mostrar"
   },
-  "showAdvancedGasInline": {
-    "message": "Controles avanzados de gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Seleccione esta opción para mostrar el precio del gas y limitar los controles directamente en las pantallas de envío y confirmación."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostrar conversión en redes de prueba"
   },
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index 1efe138a8..1df00a604 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -668,12 +668,6 @@
   "settings": {
     "message": "Seaded"
   },
-  "showAdvancedGasInline": {
-    "message": "Täiustatud gaasijuhikud"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Valige see, et kuvada gaasi hinda ja piirangut otse saatmise ning kinnitamise kuval."
-  },
   "showFiatConversionInTestnets": {
     "message": "Kuva teisendus Testnetsis"
   },
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index ccf627d31..6c623ffff 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -678,12 +678,6 @@
   "settings": {
     "message": "تنظیمات"
   },
-  "showAdvancedGasInline": {
-    "message": "کنترول های پیشرفته گاز"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "این را انتخاب نمایید تا قیمت گاز را نشان داده و کنترول ها را بصورت مستقیم در صفحات ارسال و تأیید محدود نماید."
-  },
   "showFiatConversionInTestnets": {
     "message": "نمایش تغییرات Testnets"
   },
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index b43b0bc46..c651f2ce2 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -675,12 +675,6 @@
   "settings": {
     "message": "Asetukset"
   },
-  "showAdvancedGasInline": {
-    "message": "Bensan lisävalvonta"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Valitse tämä näyttääksesi gas-hinta ja rajoittaaksesi  säätimiä suoraan lähetä- ja vahvista-ruuduissa."
-  },
   "showFiatConversionInTestnets": {
     "message": "Näytä vaihtokurssi koeverkoissa"
   },
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index 158a9b6dc..db1a1563d 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -602,12 +602,6 @@
   "settings": {
     "message": "Mga Setting"
   },
-  "showAdvancedGasInline": {
-    "message": "Mga advanced na kontrol sa gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Piliin ito para ipakita ang presyo ng gas at limitahan ang mga kontrol nang direkta sa screen ng pagpapadala at pagkumpirma."
-  },
   "showFiatConversionInTestnets": {
     "message": "Ipakita ang Conversion sa mga Testnet"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 1906a3a1f..97de591eb 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Afficher"
   },
-  "showAdvancedGasInline": {
-    "message": "Contrôles de carburant avancés"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Sélectionnez cette option pour afficher le prix du carburant et les contrôles des limites directement sur les écrans d’envoi et de confirmation."
-  },
   "showFiatConversionInTestnets": {
     "message": "Afficher la conversion sur les testnets"
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index ac0251010..c260a1450 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -675,12 +675,6 @@
   "settings": {
     "message": "הגדרות"
   },
-  "showAdvancedGasInline": {
-    "message": "אמצעי שליטה מתקדמים בדלק"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "בחר/י באפשרות זו כדי להציג אמצעי שליטה במחיר הדלק וההגבלה (limit) ישירות במסכי השליחה והאישור."
-  },
   "showFiatConversionInTestnets": {
     "message": "הצג המרה -Testnets"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 03307179f..5b7fe87f5 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "दिखाएं"
   },
-  "showAdvancedGasInline": {
-    "message": "उन्नत गैस नियंत्रण"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "गैस मूल्य और सीमा नियंत्रण को सीधे भेजने और पुष्टि करने की स्क्रीन पर दिखाने के लिए इसका चयन करें।"
-  },
   "showFiatConversionInTestnets": {
     "message": "टेस्ट नेटवर्क पर रूपांतरण दिखाएं"
   },
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index decdfbb9c..20f834514 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -671,12 +671,6 @@
   "settings": {
     "message": "Postavke"
   },
-  "showAdvancedGasInline": {
-    "message": "Napredno upravljanje gorivom"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Odaberite ovu stavku za prikaz cijene goriva i izravno ograničite kontrole prilikom slanja i potvrđivanja zaslona."
-  },
   "showFiatConversionInTestnets": {
     "message": "Prikaži konverziju na usluzi Testnets"
   },
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 340e7e7c1..970578cc2 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -671,12 +671,6 @@
   "settings": {
     "message": "Beállítások"
   },
-  "showAdvancedGasInline": {
-    "message": "Speciális gázszabályzók"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Jelöld meg ezt a gázárak és korlátozásellenőrzés mutatásához közvetlenül a küldési és megerősítési képernyőkön."
-  },
   "showFiatConversionInTestnets": {
     "message": "Konverzió mutatása Testnetsen"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 07aae2ce0..f9e095eb2 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Tampil"
   },
-  "showAdvancedGasInline": {
-    "message": "Kontrol gas lanjutan"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Pilih ini untuk menampilkan biaya gas dan kontrol batas secara langsung di layar kirim dan konfirmasi."
-  },
   "showFiatConversionInTestnets": {
     "message": "Tampilkan konversi di jaringan uji"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 8e6e39683..c9de9fef8 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -1470,12 +1470,6 @@
   "settings": {
     "message": "Impostazioni"
   },
-  "showAdvancedGasInline": {
-    "message": "Controlli gas avanzati"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Seleziona per visualizzare i controlli su prezzo e limite del gas nelle schermate di invio e conferma."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostra conversione nelle reti di test"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 3320c1442..8ad925bfa 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "表示"
   },
-  "showAdvancedGasInline": {
-    "message": "高度なガスコントロール"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "これを選択すると、ガス代と限度額のコントロールが送金画面と確認画面に直接表示されます。"
-  },
   "showFiatConversionInTestnets": {
     "message": "テストネット上に変換を表示"
   },
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index b1ab67888..4a99bac7b 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -678,12 +678,6 @@
   "settings": {
     "message": "ಸೆಟ್ಟಿಂಗ್‌ಗಳು"
   },
-  "showAdvancedGasInline": {
-    "message": "ಸುಧಾರಿತ ಗ್ಯಾಸ್ ನಿಯಂತ್ರಣಗಳು"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "ಕಳುಹಿಸುವ ಮತ್ತು ಖಚಿತಪಡಿಸುವ ಪರದೆಯ ಮೇಲೆ ನೇರವಾಗಿ ಗ್ಯಾಸ್ ಬೆಲೆ ಮತ್ತು ಮಿತಿಯ ನಿಯಂತ್ರಣಗಳನ್ನು ತೋರಿಸಲು ಇದನ್ನು ಆಯ್ಕೆಮಾಡಿ."
-  },
   "showFiatConversionInTestnets": {
     "message": "Testnets ನಲ್ಲಿ ಪರಿವರ್ತನೆಯನ್ನು ತೋರಿಸಿ"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 01f792772..08e8f864e 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "보기"
   },
-  "showAdvancedGasInline": {
-    "message": "고급 가스 제어 기능"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "이 항목을 선택하면 보내기 및 확인 화면에서 바로 가스 가격과 한도 조절을 확인할 수 있습니다."
-  },
   "showFiatConversionInTestnets": {
     "message": "테스트넷에 전환 표시"
   },
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index d39141fac..699c2ddb8 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -678,12 +678,6 @@
   "settings": {
     "message": "Nustatymai"
   },
-  "showAdvancedGasInline": {
-    "message": "Išplėstiniai dujų valdikliai"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Pasirinkite tai, kad būtų rodoma dujų kaina, ir ribokite valdymo elementus tiesiogiai siuntimo ir patvirtinimo ekranuose."
-  },
   "showFiatConversionInTestnets": {
     "message": "Rodyti keitimą „Testnet“"
   },
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index d174f8442..bf6a65327 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -674,12 +674,6 @@
   "settings": {
     "message": "Iestatījumi"
   },
-  "showAdvancedGasInline": {
-    "message": "Papildu Gas vadīklas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Atlasiet šo, lai parādītu Gas cenu un ierobežotu kontroles iespējas tieši sūtīšanas un apstiprināšanas ekrānos."
-  },
   "showFiatConversionInTestnets": {
     "message": "Rādīt konversiju testa tīklos"
   },
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index 5dd5a8216..c40ac453f 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -658,12 +658,6 @@
   "settings": {
     "message": "Tetapan"
   },
-  "showAdvancedGasInline": {
-    "message": "Kawalan gas lanjutan"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Pilih ini untuk menunjukkan harga gas dan kawalan had terus di skrin hantar dan sahkan."
-  },
   "showFiatConversionInTestnets": {
     "message": "Tunjukkan Penukaran di Testnets"
   },
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index 5e904cf86..dd803372c 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -659,12 +659,6 @@
   "settings": {
     "message": "Innstillinger"
   },
-  "showAdvancedGasInline": {
-    "message": "Avanserte datakraftskontroller"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Velg dette for å vise bensinpris og begrensningskontroller direkte på send- og bekreftskjermbildene."
-  },
   "showFiatConversionInTestnets": {
     "message": "Vis konvertering på Testnets "
   },
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index 48f21c3c4..4fc1c3f08 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -1320,12 +1320,6 @@
   "settings": {
     "message": "Mga Setting"
   },
-  "showAdvancedGasInline": {
-    "message": "Mga advanced na kontrol sa gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Piliin ito para direktang maipakita ang presyo ng gas at mga kontrol sa limitasyon sa mga screen ng pagpapadala at pagkumpirma."
-  },
   "showFiatConversionInTestnets": {
     "message": "Ipakita ang Conversion sa Testnets"
   },
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index 531164a02..0e10fedfd 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -672,12 +672,6 @@
   "settings": {
     "message": "Ustawienia"
   },
-  "showAdvancedGasInline": {
-    "message": "Zaawansowana kontrola gazu"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Wybierz tę opcję, aby móc zmienić cenę i limit gazu bezpośrednio na ekranach wysyłania i potwierdzania."
-  },
   "showFiatConversionInTestnets": {
     "message": "Pokaż przeliczanie w sieciach testowych"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 544cc1998..8da0e5df6 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Exibir"
   },
-  "showAdvancedGasInline": {
-    "message": "Controles avançados de gás"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Selecione isso para mostrar o preço do gás e limitar os controles diretamente nas telas de envio e de confirmação."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostrar conversão nas redes de teste"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index e051519b8..f4bf0e889 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -2070,12 +2070,6 @@
   "show": {
     "message": "Mostrar"
   },
-  "showAdvancedGasInline": {
-    "message": "Controles avançados de gás"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Selecione isso para mostrar o preço do gás e limitar os controles diretamente nas telas de envio e de confirmação."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostrar conversão nas redes de teste"
   },
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index 4fc356286..7c452f913 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -665,12 +665,6 @@
   "settings": {
     "message": "Setări"
   },
-  "showAdvancedGasInline": {
-    "message": "Controale avansate pentru gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Selectați aceasta pentru a arăta prețul gasului și comenzile de limitare direct pe ecranele de trimitere și confirmare."
-  },
   "showFiatConversionInTestnets": {
     "message": "Afișează conversiile pe rețelele de test (testnets)"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 89293012d..d9ca24758 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Показать"
   },
-  "showAdvancedGasInline": {
-    "message": "Расширенное управление газом"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Выберите это, чтобы отображать цену газа и управление лимитами непосредственно на экранах отправки и подтверждения."
-  },
   "showFiatConversionInTestnets": {
     "message": "Показывать конвертацию в тестовых сетях"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index 7ab10cf1e..0bfcaff58 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -650,12 +650,6 @@
   "settings": {
     "message": "Nastavení"
   },
-  "showAdvancedGasInline": {
-    "message": "Pokročilé ovládacie prvky GAS"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Vyberte túto možnosť vtedy, keď chcete priamo na obrazovke odosielania a potvrdenia zobraziť ceny za GAS a ovládacie prvky limitov."
-  },
   "showFiatConversionInTestnets": {
     "message": "Zobraziť konverziu na Testnets"
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index 2c774019e..31c068ce2 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -666,12 +666,6 @@
   "settings": {
     "message": "Nastavitve"
   },
-  "showAdvancedGasInline": {
-    "message": "Napredno krmiljenje plina"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Izberite to možnost, če želite prikazati ceno plina in omejiti nadzor neposredno na zaslonih za pošiljanje in potrditev."
-  },
   "showFiatConversionInTestnets": {
     "message": "Pokažite pretvorbo na testnih omrežjih"
   },
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index c87c6972c..125ac7882 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -669,12 +669,6 @@
   "settings": {
     "message": "Podešavanja"
   },
-  "showAdvancedGasInline": {
-    "message": "Napredne kontrole gasa"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Izaberite ovo kako biste prikazali cenu gasa i kontrole limita direktno na ekranima za slanje i potvrđivanje."
-  },
   "showFiatConversionInTestnets": {
     "message": "Prikažite konverzije na Testnet"
   },
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index f8912daa6..216e01787 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -662,12 +662,6 @@
   "settings": {
     "message": "Inställningar"
   },
-  "showAdvancedGasInline": {
-    "message": "Avancerade gaskontroller"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Välj detta för att visa gas-pris och gränskontroller direkt på skicka och bekräfta-skärmarna."
-  },
   "showFiatConversionInTestnets": {
     "message": "Visa omvandling på testnätverk"
   },
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index c50e6e0bc..e49fb4d89 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -656,12 +656,6 @@
   "settings": {
     "message": "Mipangilio"
   },
-  "showAdvancedGasInline": {
-    "message": "Udhibiti wa juu wa gesi"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Chagua hii ili uonyeshe bei ya gesi na punguza vidhibiti moja kwa moja kwenye skrini za tuma na thibitisha."
-  },
   "showFiatConversionInTestnets": {
     "message": "Onyesha Ubadilishaji kwenye Testnets"
   },
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index 42b71a318..273340d23 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -344,9 +344,6 @@
   "settings": {
     "message": "การตั้งค่า"
   },
-  "showAdvancedGasInline": {
-    "message": "การควบคุม Gas ขั้นสูง"
-  },
   "showPrivateKeys": {
     "message": "แสดงคีย์ส่วนตัว"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index ef944e308..10886a0cc 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Ipakita"
   },
-  "showAdvancedGasInline": {
-    "message": "Mga advanced na kontrol sa gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Piliin ito para direktang maipakita ang presyo ng gas at mga kontrol sa limitasyon sa mga screen ng pagpapadala at pagkumpirma."
-  },
   "showFiatConversionInTestnets": {
     "message": "Ipakita ang Conversion sa Testnets"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index eb3841356..cf3cb89ce 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Göster"
   },
-  "showAdvancedGasInline": {
-    "message": "Gelişmiş gaz kontrolleri"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Gaz fiyatı ve limit kontrollerini doğrudan gönder ve onayla ekranlarında göstermek için bunu seçin."
-  },
   "showFiatConversionInTestnets": {
     "message": "Test ağlarında dönüşümü göster"
   },
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index 83f6857de..082257a30 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -678,12 +678,6 @@
   "settings": {
     "message": "Налаштування"
   },
-  "showAdvancedGasInline": {
-    "message": "Розширене керування газом"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Виберіть цей параметр, щоб відображати регулятори ціни й ліміту газу на екранах надсилання й підтвердження."
-  },
   "showFiatConversionInTestnets": {
     "message": "Показати бесіду у Testnet"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 1aebc6b67..05ccf3799 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Hiển thị"
   },
-  "showAdvancedGasInline": {
-    "message": "Quyền kiểm soát gas nâng cao"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Chọn tùy chọn này để hiển thị các quyền kiểm soát giá gas và giới hạn ngay trên màn hình gửi và xác nhận."
-  },
   "showFiatConversionInTestnets": {
     "message": "Hiển thị tỷ lệ quy đổi trên các mạng thử nghiệm"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 78d5099ef..702241f88 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "显示"
   },
-  "showAdvancedGasInline": {
-    "message": "高级燃料控制"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "选择此项可直接在发送和确认界面显示燃料价格和上限控制。"
-  },
   "showFiatConversionInTestnets": {
     "message": "在测试网络上显示转换"
   },
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index ccb72664b..ae2f8f666 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -1245,12 +1245,6 @@
   "settings": {
     "message": "設定"
   },
-  "showAdvancedGasInline": {
-    "message": "顯示進階 gas 控制選項"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "選擇此項會在傳送或確認畫面顯示可微調 gas 價格以及 gas 上限的功能"
-  },
   "showFiatConversionInTestnets": {
     "message": "在測試網上顯示匯率"
   },
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index 75cdab2de..6a62b1c78 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -77,13 +77,6 @@ export const SETTINGS_CONSTANTS = [
     route: `${ADVANCED_ROUTE}#clear-activity`,
     icon: 'fas fa-sliders-h',
   },
-  {
-    tabMessage: (t) => t('advanced'),
-    sectionMessage: (t) => t('showAdvancedGasInline'),
-    descriptionMessage: (t) => t('showAdvancedGasInlineDescription'),
-    route: `${ADVANCED_ROUTE}#advanced-gascontrols`,
-    icon: 'fas fa-sliders-h',
-  },
   {
     tabMessage: (t) => t('advanced'),
     sectionMessage: (t) => t('showHexData'),
diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js
index ec4839b07..1c8a3ed44 100644
--- a/ui/helpers/utils/settings-search.test.js
+++ b/ui/helpers/utils/settings-search.test.js
@@ -33,8 +33,6 @@ const t = (key) => {
       return 'Clear activity and nonce data';
     case 'clearActivityDescription':
       return "This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change.";
-    case 'showAdvancedGasInline':
-      return 'Advanced gas controls';
     case 'showAdvancedGasInlineDescription':
       return 'Select this to show gas price and limit controls directly on the send and confirm screens.';
     case 'showHexData':
@@ -159,7 +157,7 @@ describe('Settings Search Utils', () => {
     });
 
     it('should get good advanced section number', () => {
-      expect(getNumberOfSettingsInSection(t, t('advanced'))).toStrictEqual(14);
+      expect(getNumberOfSettingsInSection(t, t('advanced'))).toStrictEqual(13);
     });
 
     it('should get good contact section number', () => {
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index dcb0d47ce..4c4dd79e0 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -41,8 +41,6 @@ export default class AdvancedTab extends PureComponent {
     warning: PropTypes.string,
     history: PropTypes.object,
     sendHexData: PropTypes.bool,
-    setAdvancedInlineGasFeatureFlag: PropTypes.func,
-    advancedInlineGas: PropTypes.bool,
     showFiatInTestnets: PropTypes.bool,
     showTestNetworks: PropTypes.bool,
     autoLockTimeLimit: PropTypes.number,
@@ -262,43 +260,13 @@ export default class AdvancedTab extends PureComponent {
     );
   }
 
-  renderAdvancedGasInputInline() {
-    const { t } = this.context;
-    const { advancedInlineGas, setAdvancedInlineGasFeatureFlag } = this.props;
-
-    return (
-      <div
-        ref={this.settingsRefs[3]}
-        className="settings-page__content-row"
-        data-testid="advanced-setting-advanced-gas-inline"
-      >
-        <div className="settings-page__content-item">
-          <span>{t('showAdvancedGasInline')}</span>
-          <div className="settings-page__content-description">
-            {t('showAdvancedGasInlineDescription')}
-          </div>
-        </div>
-        <div className="settings-page__content-item">
-          <div className="settings-page__content-item-col">
-            <ToggleButton
-              value={advancedInlineGas}
-              onToggle={(value) => setAdvancedInlineGasFeatureFlag(!value)}
-              offLabel={t('off')}
-              onLabel={t('on')}
-            />
-          </div>
-        </div>
-      </div>
-    );
-  }
-
   renderHexDataOptIn() {
     const { t } = this.context;
     const { sendHexData, setHexDataFeatureFlag } = this.props;
 
     return (
       <div
-        ref={this.settingsRefs[4]}
+        ref={this.settingsRefs[3]}
         className="settings-page__content-row"
         data-testid="advanced-setting-hex-data"
       >
@@ -329,7 +297,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[5]}
+        ref={this.settingsRefs[4]}
         className="settings-page__content-row"
         data-testid="advanced-setting-show-testnet-conversion"
       >
@@ -361,7 +329,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[6]}
+        ref={this.settingsRefs[5]}
         className="settings-page__content-row"
         data-testid="advanced-setting-show-testnet-conversion"
       >
@@ -391,7 +359,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[7]}
+        ref={this.settingsRefs[6]}
         className="settings-page__content-row"
         data-testid="advanced-setting-custom-nonce"
       >
@@ -422,7 +390,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[8]}
+        ref={this.settingsRefs[7]}
         className="settings-page__content-row"
         data-testid="advanced-setting-auto-lock"
       >
@@ -510,7 +478,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[9]}
+        ref={this.settingsRefs[8]}
         className="settings-page__content-row"
         data-testId="ledger-live-control"
       >
@@ -576,7 +544,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[10]}
+        ref={this.settingsRefs[9]}
         className="settings-page__content-row"
         data-testid="advanced-setting-dismiss-reminder"
       >
@@ -754,7 +722,6 @@ export default class AdvancedTab extends PureComponent {
         {this.renderStateLogs()}
         {this.renderMobileSync()}
         {this.renderResetAccount()}
-        {this.renderAdvancedGasInputInline()}
         {this.renderHexDataOptIn()}
         {this.renderShowConversionInTestnets()}
         {this.renderToggleTestNetworks()}
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 c5f52a12d..06bd51011 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -48,7 +48,7 @@ describe('AdvancedTab Component', () => {
   it('should toggle show test networks', () => {
     const { queryAllByRole } = renderWithProvider(<AdvancedTab />, mockStore);
 
-    const testNetworkToggle = queryAllByRole('checkbox')[3];
+    const testNetworkToggle = queryAllByRole('checkbox')[2];
 
     fireEvent.click(testNetworkToggle);
 
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.container.js b/ui/pages/settings/advanced-tab/advanced-tab.container.js
index 80b781f68..95ce14e4a 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.container.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.container.js
@@ -25,7 +25,7 @@ export const mapStateToProps = (state) => {
     metamask,
   } = state;
   const {
-    featureFlags: { sendHexData, advancedInlineGas } = {},
+    featureFlags: { sendHexData } = {},
     disabledRpcMethodPreferences,
     useNonceField,
     ledgerTransportType,
@@ -45,7 +45,6 @@ export const mapStateToProps = (state) => {
   return {
     warning,
     sendHexData,
-    advancedInlineGas,
     showFiatInTestnets,
     showTestNetworks,
     autoLockTimeLimit,
@@ -69,8 +68,6 @@ export const mapDispatchToProps = (dispatch) => {
     displayWarning: (warning) => dispatch(displayWarning(warning)),
     showResetAccountConfirmationModal: () =>
       dispatch(showModal({ name: 'CONFIRM_RESET_ACCOUNT' })),
-    setAdvancedInlineGasFeatureFlag: (shouldShow) =>
-      dispatch(setFeatureFlag('advancedInlineGas', shouldShow)),
     setUseNonceField: (value) => dispatch(setUseNonceField(value)),
     setShowFiatConversionOnTestnetsPreference: (value) => {
       return dispatch(setShowFiatConversionOnTestnetsPreference(value));
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.stories.js b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
index f2508300b..a6c3f7eb2 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.stories.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
@@ -9,7 +9,6 @@ export default {
     warning: { control: 'text' },
     useNonceField: { control: 'boolean' },
     sendHexData: { control: 'boolean' },
-    advancedInlineGas: { control: 'boolean' },
     showFiatInTestnets: { control: 'boolean' },
     useLedgerLive: { control: 'boolean' },
     dismissSeedBackUpReminder: { control: 'boolean' },
@@ -28,9 +27,6 @@ export default {
     showResetAccountConfirmationModal: {
       action: 'showResetAccountConfirmationModal',
     },
-    setAdvancedInlineGasFeatureFlag: {
-      action: 'setAdvancedInlineGasFeatureFlag',
-    },
   },
 };
 
@@ -39,7 +35,6 @@ export const DefaultStory = (args) => {
     {
       useNonceField,
       sendHexData,
-      advancedInlineGas,
       showFiatInTestnets,
       dismissSeedBackUpReminder,
     },
@@ -58,12 +53,6 @@ export const DefaultStory = (args) => {
     });
   };
 
-  const handleAdvancedInlineGas = () => {
-    updateArgs({
-      advancedInlineGas: !advancedInlineGas,
-    });
-  };
-
   const handleShowFiatInTestnets = () => {
     updateArgs({
       showFiatInTestnets: !showFiatInTestnets,
@@ -83,8 +72,6 @@ export const DefaultStory = (args) => {
         setUseNonceField={handleUseNonceField}
         sendHexData={sendHexData}
         setHexDataFeatureFlag={handleSendHexData}
-        advancedInlineGas={advancedInlineGas}
-        setAdvancedInlineGasFeatureFlag={handleAdvancedInlineGas}
         showFiatInTestnets={showFiatInTestnets}
         setShowFiatConversionOnTestnetsPreference={handleShowFiatInTestnets}
         dismissSeedBackUpReminder={dismissSeedBackUpReminder}
@@ -100,7 +87,6 @@ DefaultStory.args = {
   warning: 'Warning Sample',
   useNonceField: false,
   sendHexData: false,
-  advancedInlineGas: false,
   showFiatInTestnets: false,
   useLedgerLive: false,
   dismissSeedBackUpReminder: false,

From d2098e26acc5306094be87d4bc6d5a75d66d4c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CGoktug?= <“goktug.poyraz@consensys.net”>
Date: Fri, 10 Mar 2023 13:22:51 +0100
Subject: [PATCH 071/129] fix: fix theme issues of desktop pairing page

---
 shared/lib/error-utils.js                     |   4 +-
 .../desktop-pairing.test.js.snap              | 246 +++++++++---------
 .../desktop-pairing.component.js              | 132 +++++-----
 ui/pages/desktop-pairing/index.scss           | 111 +-------
 4 files changed, 206 insertions(+), 287 deletions(-)

diff --git a/shared/lib/error-utils.js b/shared/lib/error-utils.js
index d5f5feb3f..b04a2f72a 100644
--- a/shared/lib/error-utils.js
+++ b/shared/lib/error-utils.js
@@ -126,7 +126,9 @@ function disableDesktop(backgroundConnection) {
 }
 
 export function downloadDesktopApp() {
-  global.platform.openTab({ url: 'https://metamask.io/' });
+  global.platform.openTab({
+    url: 'https://github.com/MetaMask/metamask-desktop/releases',
+  });
 }
 
 export function downloadExtension() {
diff --git a/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap b/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap
index dcead5fb5..c3a42d035 100644
--- a/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap
+++ b/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap
@@ -3,139 +3,134 @@
 exports[`Desktop Pairing page should render otp component 1`] = `
 <div>
   <div
-    class="page-container__content"
+    class="box box--margin-right-2 box--margin-left-2 box--display-flex box--flex-direction-column box--align-items-center"
   >
     <div
-      class="desktop-pairing"
+      class="box box--margin-top-8 box--margin-bottom-8 box--display-flex box--flex-direction-row box--justify-content-center"
     >
-      <div>
-        <div
-          class="box box--margin-top-12 box--margin-right-6 box--margin-left-6 box--display-flex box--flex-direction-column box--align-items-center box--text-align-center"
-        >
-          <svg
-            fill="currentColor"
-            height="64"
-            viewBox="0 0 64 39"
-            width="64"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M2.05588 38.7539L2.05764 38.7541H40.952H40.9539C40.9557 38.7541 40.9573 38.7536 40.9591 38.7536C42.0608 38.7497 43.0116 37.8498 43.0116 36.6965C43.0112 35.5025 43.0127 41.0218 43.0084 25.0192H41.7318V32.2147H1.27784V8.06471H41.7318V13.7349H43.0084C43.0088 12.6803 43.0073 17.5546 43.0116 3.42458C43.0116 2.33886 42.1096 1.3715 40.9592 1.36749C40.9574 1.36749 40.9557 1.36694 40.9539 1.36694H40.952H2.05826L2.05592 1.3671C0.938953 1.36848 0 2.2928 0 3.42458C0.00118187 40.1604 0.00115779 35.5443 0.00151939 36.7115C0.00442983 37.7954 0.916013 38.7525 2.05588 38.7539ZM40.952 2.64354C40.9545 2.64354 40.9568 2.64459 40.9593 2.64463C41.3592 2.6475 41.7318 2.97087 41.7318 3.42396V6.78811H1.27784V3.42396C1.27784 3.4215 1.27776 3.42143 1.27773 3.41905C1.28066 3.03143 1.60496 2.64481 2.05596 2.64389L2.05826 2.64354H40.952ZM41.7318 33.4913V36.6971C41.7318 37.1484 41.3421 37.4739 40.959 37.4765C40.9566 37.4765 40.9545 37.4775 40.952 37.4775H2.05826L2.05588 37.4772C1.67874 37.4762 1.2822 37.1511 1.278 36.7035C1.278 36.7013 1.27784 36.6993 1.27784 36.6971V33.4913H41.7318Z"
-              fill="black"
-            />
-            <path
-              d="M8.2473 4.07751H3.19141V5.35411H8.2473V4.07751Z"
-              fill="black"
-            />
-            <path
-              d="M23.5665 34.8462H18.5106V36.1228H23.5665V34.8462Z"
-              fill="black"
-            />
-            <path
-              d="M36.5719 5.16847C36.8185 4.92251 36.8186 4.50823 36.5719 4.26214C36.3294 4.0259 35.9018 4.03244 35.6656 4.26214C35.4197 4.52205 35.4195 4.90836 35.6656 5.16847C35.9317 5.42024 36.3318 5.40917 36.5719 5.16847Z"
-              fill="black"
-            />
-            <path
-              d="M58.7234 1.98595V5.13942H44.305V6.41602H58.7234V29.2623H44.305V30.5389H58.7234V33.544C58.7234 33.9351 58.408 34.2533 58.0203 34.2533H44.305V35.5299H58.0203C59.1117 35.5299 60 34.6392 60 33.544C60 26.776 60 9.50087 60 1.98595V1.97972C60 0.888256 59.1117 0 58.0203 0H42.8152V1.2766H58.0203C58.408 1.2766 58.7234 1.59481 58.7234 1.98595Z"
-              fill="black"
-            />
-            <path
-              d="M51.0488 2.56812H46.2522V3.84471H51.0488V2.56812Z"
-              fill="black"
-            />
-            <path
-              d="M51.0488 31.7573H46.2522V33.0339H51.0488V31.7573Z"
-              fill="black"
-            />
-            <path
-              d="M53.8826 3.65558C54.1329 3.4194 54.1259 2.98539 53.8826 2.7558C53.6463 2.51955 53.2125 2.51955 52.9762 2.7558C52.7244 3.02196 52.7345 3.41386 52.9762 3.65558C53.236 3.91538 53.6465 3.90578 53.8826 3.65558Z"
-              fill="black"
-            />
-            <path
-              d="M37.2794 13.3285L34.9387 15.6694L37.2794 18.0101L38.1819 17.1075L37.3822 16.3077H48.899V15.0311H37.382L38.1819 14.2311L37.2794 13.3285Z"
-              fill="black"
-            />
-            <path
-              d="M46.5582 24.5231L47.4608 25.4257L49.8015 23.0848L47.4608 20.7441L46.5582 21.6467L47.358 22.4465H35.8412V23.7231H47.3581L46.5582 24.5231Z"
-              fill="black"
-            />
-            <path
-              d="M33.8298 12.7659H8.29785V14.0425H33.8298V12.7659Z"
-              fill="black"
-            />
-            <path
-              d="M33.8298 15.9574H8.29785V17.234H33.8298V15.9574Z"
-              fill="black"
-            />
-            <path
-              d="M33.8298 19.7874H8.29785V21.0639H33.8298V19.7874Z"
-              fill="black"
-            />
-            <path
-              d="M33.8298 22.9788H8.29785V24.2554H33.8298V22.9788Z"
-              fill="black"
-            />
-            <path
-              d="M57.0254 12.6194H51.0127V13.896H57.0254V12.6194Z"
-              fill="black"
-            />
-            <path
-              d="M57.0254 16.0691H51.0127V17.3457H57.0254V16.0691Z"
-              fill="black"
-            />
-            <path
-              d="M57.0254 19.5188H51.0127V20.7954H57.0254V19.5188Z"
-              fill="black"
-            />
-            <path
-              d="M57.0254 22.9688H51.0127V24.2453H57.0254V22.9688Z"
-              fill="black"
-            />
-          </svg>
-        </div>
-      </div>
-      <div
-        class="desktop-pairing__title"
+      <svg
+        class="desktop-pairing__icon"
+        fill="currentColor"
+        height="64"
+        viewBox="0 0 64 39"
+        width="64"
+        xmlns="http://www.w3.org/2000/svg"
       >
-        Pair with Desktop
-      </div>
-      <div
-        class="desktop-pairing__subtitle"
-      >
-        Open your MetaMask Desktop and type this code
-      </div>
+        <path
+          d="M2.05588 38.7539L2.05764 38.7541H40.952H40.9539C40.9557 38.7541 40.9573 38.7536 40.9591 38.7536C42.0608 38.7497 43.0116 37.8498 43.0116 36.6965C43.0112 35.5025 43.0127 41.0218 43.0084 25.0192H41.7318V32.2147H1.27784V8.06471H41.7318V13.7349H43.0084C43.0088 12.6803 43.0073 17.5546 43.0116 3.42458C43.0116 2.33886 42.1096 1.3715 40.9592 1.36749C40.9574 1.36749 40.9557 1.36694 40.9539 1.36694H40.952H2.05826L2.05592 1.3671C0.938953 1.36848 0 2.2928 0 3.42458C0.00118187 40.1604 0.00115779 35.5443 0.00151939 36.7115C0.00442983 37.7954 0.916013 38.7525 2.05588 38.7539ZM40.952 2.64354C40.9545 2.64354 40.9568 2.64459 40.9593 2.64463C41.3592 2.6475 41.7318 2.97087 41.7318 3.42396V6.78811H1.27784V3.42396C1.27784 3.4215 1.27776 3.42143 1.27773 3.41905C1.28066 3.03143 1.60496 2.64481 2.05596 2.64389L2.05826 2.64354H40.952ZM41.7318 33.4913V36.6971C41.7318 37.1484 41.3421 37.4739 40.959 37.4765C40.9566 37.4765 40.9545 37.4775 40.952 37.4775H2.05826L2.05588 37.4772C1.67874 37.4762 1.2822 37.1511 1.278 36.7035C1.278 36.7013 1.27784 36.6993 1.27784 36.6971V33.4913H41.7318Z"
+          fill="black"
+        />
+        <path
+          d="M8.2473 4.07751H3.19141V5.35411H8.2473V4.07751Z"
+          fill="black"
+        />
+        <path
+          d="M23.5665 34.8462H18.5106V36.1228H23.5665V34.8462Z"
+          fill="black"
+        />
+        <path
+          d="M36.5719 5.16847C36.8185 4.92251 36.8186 4.50823 36.5719 4.26214C36.3294 4.0259 35.9018 4.03244 35.6656 4.26214C35.4197 4.52205 35.4195 4.90836 35.6656 5.16847C35.9317 5.42024 36.3318 5.40917 36.5719 5.16847Z"
+          fill="black"
+        />
+        <path
+          d="M58.7234 1.98595V5.13942H44.305V6.41602H58.7234V29.2623H44.305V30.5389H58.7234V33.544C58.7234 33.9351 58.408 34.2533 58.0203 34.2533H44.305V35.5299H58.0203C59.1117 35.5299 60 34.6392 60 33.544C60 26.776 60 9.50087 60 1.98595V1.97972C60 0.888256 59.1117 0 58.0203 0H42.8152V1.2766H58.0203C58.408 1.2766 58.7234 1.59481 58.7234 1.98595Z"
+          fill="black"
+        />
+        <path
+          d="M51.0488 2.56812H46.2522V3.84471H51.0488V2.56812Z"
+          fill="black"
+        />
+        <path
+          d="M51.0488 31.7573H46.2522V33.0339H51.0488V31.7573Z"
+          fill="black"
+        />
+        <path
+          d="M53.8826 3.65558C54.1329 3.4194 54.1259 2.98539 53.8826 2.7558C53.6463 2.51955 53.2125 2.51955 52.9762 2.7558C52.7244 3.02196 52.7345 3.41386 52.9762 3.65558C53.236 3.91538 53.6465 3.90578 53.8826 3.65558Z"
+          fill="black"
+        />
+        <path
+          d="M37.2794 13.3285L34.9387 15.6694L37.2794 18.0101L38.1819 17.1075L37.3822 16.3077H48.899V15.0311H37.382L38.1819 14.2311L37.2794 13.3285Z"
+          fill="black"
+        />
+        <path
+          d="M46.5582 24.5231L47.4608 25.4257L49.8015 23.0848L47.4608 20.7441L46.5582 21.6467L47.358 22.4465H35.8412V23.7231H47.3581L46.5582 24.5231Z"
+          fill="black"
+        />
+        <path
+          d="M33.8298 12.7659H8.29785V14.0425H33.8298V12.7659Z"
+          fill="black"
+        />
+        <path
+          d="M33.8298 15.9574H8.29785V17.234H33.8298V15.9574Z"
+          fill="black"
+        />
+        <path
+          d="M33.8298 19.7874H8.29785V21.0639H33.8298V19.7874Z"
+          fill="black"
+        />
+        <path
+          d="M33.8298 22.9788H8.29785V24.2554H33.8298V22.9788Z"
+          fill="black"
+        />
+        <path
+          d="M57.0254 12.6194H51.0127V13.896H57.0254V12.6194Z"
+          fill="black"
+        />
+        <path
+          d="M57.0254 16.0691H51.0127V17.3457H57.0254V16.0691Z"
+          fill="black"
+        />
+        <path
+          d="M57.0254 19.5188H51.0127V20.7954H57.0254V19.5188Z"
+          fill="black"
+        />
+        <path
+          d="M57.0254 22.9688H51.0127V24.2453H57.0254V22.9688Z"
+          fill="black"
+        />
+      </svg>
     </div>
+    <h3
+      align="center"
+      class="box mm-text mm-text--heading-md mm-text--color-text-default box--flex-direction-row"
+    >
+      Pair with Desktop
+    </h3>
+    <p
+      align="center"
+      class="box mm-text mm-text--body-md mm-text--color-text-default box--margin-top-2 box--flex-direction-row"
+    >
+      Open your MetaMask Desktop and type this code
+    </p>
     <div
-      class="desktop-pairing"
+      class="box desktop-pairing__clickable box--margin-top-6 box--margin-bottom-6 box--flex-direction-row"
+      data-testid="desktop-pairing-otp-content"
     >
       <div
-        class="desktop-pairing__clickable"
-        data-testid="desktop-pairing-otp-content"
+        class="desktop-pairing__tooltip-wrapper"
       >
         <div
-          class="box box--margin-right-6 box--margin-left-6 box--display-flex box--flex-direction-column box--align-items-center box--text-align-center"
+          aria-describedby="tippy-tooltip-1"
+          class=""
+          data-original-title="Copy to clipboard"
+          data-tooltipped=""
+          style="display: inline;"
+          tabindex="0"
         >
-          <div
-            class="desktop-pairing__tooltip-wrapper"
+          <p
+            align="center"
+            class="box mm-text desktop-pairing__otp mm-text--body-md mm-text--color-text-default box--flex-direction-row"
           >
-            <div
-              aria-describedby="tippy-tooltip-1"
-              class=""
-              data-original-title="Copy to clipboard"
-              data-tooltipped=""
-              style="display: inline;"
-              tabindex="0"
-            >
-              <p
-                class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography desktop-pairing__otp typography--p typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
-              >
-                123456
-              </p>
-            </div>
-          </div>
+            123456
+          </p>
         </div>
+      </div>
+      <div
+        class="box box--margin-top-4 box--margin-bottom-6 box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center"
+      >
         <p
-          class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography desktop-pairing__countdown-timer typography--p typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
+          align="center"
+          class="box mm-text desktop-pairing__countdown-timer mm-text--body-md mm-text--color-text-default box--flex-direction-row"
         >
           <span>
              
@@ -149,15 +144,16 @@ exports[`Desktop Pairing page should render otp component 1`] = `
              
           </span>
         </p>
-        <div
-          class="desktop-pairing__description"
-        >
-          If the pairing is successful, extension will restart and you'll have to re-enter your password.
-        </div>
       </div>
+      <p
+        align="center"
+        class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+      >
+        If the pairing is successful, extension will restart and you'll have to re-enter your password.
+      </p>
     </div>
     <div
-      class="desktop-pairing__buttons"
+      class="box box--flex-direction-row box--width-1/2"
     >
       <button
         class="button btn--rounded btn-primary"
diff --git a/ui/pages/desktop-pairing/desktop-pairing.component.js b/ui/pages/desktop-pairing/desktop-pairing.component.js
index 124180d0b..098976b66 100644
--- a/ui/pages/desktop-pairing/desktop-pairing.component.js
+++ b/ui/pages/desktop-pairing/desktop-pairing.component.js
@@ -3,19 +3,20 @@ import { useHistory } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import Button from '../../components/ui/button';
 import { SECOND } from '../../../shared/constants/time';
-import Typography from '../../components/ui/typography';
 import { I18nContext } from '../../contexts/i18n';
 import IconDesktopPairing from '../../components/ui/icon/icon-desktop-pairing';
 import {
   TEXT_ALIGN,
-  TypographyVariant,
+  TextVariant,
   DISPLAY,
   AlignItems,
-  FLEX_DIRECTION,
+  BLOCK_SIZES,
+  JustifyContent,
 } from '../../helpers/constants/design-system';
 import Box from '../../components/ui/box/box';
 import { useCopyToClipboard } from '../../hooks/useCopyToClipboard';
 import Tooltip from '../../components/ui/tooltip';
+import { Text } from '../../components/component-library';
 
 export default function DesktopPairingPage({
   generateDesktopOtp,
@@ -75,19 +76,14 @@ export default function DesktopPairingPage({
 
   const renderIcon = () => {
     return (
-      <div>
-        <Box
-          display={DISPLAY.FLEX}
-          alignItems={AlignItems.center}
-          textAlign={TEXT_ALIGN.CENTER}
-          flexDirection={FLEX_DIRECTION.COLUMN}
-          marginLeft={6}
-          marginRight={6}
-          marginTop={12}
-        >
-          <IconDesktopPairing size={64} />
-        </Box>
-      </div>
+      <Box
+        display={DISPLAY.FLEX}
+        justifyContent={JustifyContent.center}
+        marginTop={8}
+        marginBottom={8}
+      >
+        <IconDesktopPairing className="desktop-pairing__icon" size={64} />
+      </Box>
     );
   };
 
@@ -104,56 +100,68 @@ export default function DesktopPairingPage({
     hideLoadingIndication();
 
     return (
-      <div
-        className="desktop-pairing__clickable"
-        onClick={() => {
-          handleCopy(otp);
-        }}
-        data-testid="desktop-pairing-otp-content"
-      >
+      <>
+        <Text variant={TextVariant.headingMd} align={TEXT_ALIGN.CENTER}>
+          {t('desktopPageTitle')}
+        </Text>
+        <Text
+          marginTop={2}
+          variant={TextVariant.bodyMd}
+          align={TEXT_ALIGN.CENTER}
+        >
+          {t('desktopPageSubTitle')}
+        </Text>
         <Box
-          display={DISPLAY.FLEX}
-          alignItems={AlignItems.center}
-          textAlign={TEXT_ALIGN.CENTER}
-          flexDirection={FLEX_DIRECTION.COLUMN}
-          marginLeft={6}
-          marginRight={6}
+          marginBottom={6}
+          marginTop={6}
+          className="desktop-pairing__clickable"
+          onClick={() => {
+            handleCopy(otp);
+          }}
+          data-testid="desktop-pairing-otp-content"
         >
           <Tooltip
             wrapperClassName="desktop-pairing__tooltip-wrapper"
             position="top"
             title={copied ? t('copiedExclamation') : t('copyToClipboard')}
           >
-            <Typography
-              align={TEXT_ALIGN.CENTER}
-              className="desktop-pairing__otp"
-            >
+            <Text align={TEXT_ALIGN.CENTER} className="desktop-pairing__otp">
               {otp}
-            </Typography>
+            </Text>
           </Tooltip>
+          <Box
+            display={DISPLAY.FLEX}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+            marginTop={4}
+            marginBottom={6}
+          >
+            <Text
+              variant={TextVariant.paragraph}
+              align={TEXT_ALIGN.CENTER}
+              className="desktop-pairing__countdown-timer"
+            >
+              {t('desktopPairingExpireMessage', [
+                <span
+                  className="desktop-pairing__countdown-timer-seconds"
+                  key={1}
+                >
+                  {getExpireDuration()}
+                </span>,
+              ])}
+            </Text>
+          </Box>
+          <Text align={TEXT_ALIGN.CENTER} variant={TextVariant.bodySm}>
+            {t('desktopPageDescription')}
+          </Text>
         </Box>
-
-        <Typography
-          variant={TypographyVariant.paragraph}
-          align={TEXT_ALIGN.CENTER}
-          className="desktop-pairing__countdown-timer"
-        >
-          {t('desktopPairingExpireMessage', [
-            <span className="desktop-pairing__countdown-timer-seconds" key={1}>
-              {getExpireDuration()}
-            </span>,
-          ])}
-        </Typography>
-        <div className="desktop-pairing__description">
-          {t('desktopPageDescription')}
-        </div>
-      </div>
+      </>
     );
   };
 
   const renderFooter = () => {
     return (
-      <div className="desktop-pairing__buttons">
+      <Box width={BLOCK_SIZES.HALF}>
         <Button
           type="primary"
           rounded
@@ -163,22 +171,22 @@ export default function DesktopPairingPage({
         >
           {t('done')}
         </Button>
-      </div>
+      </Box>
     );
   };
 
   return (
-    <div className="page-container__content">
-      <div className="desktop-pairing">
-        {renderIcon()}
-        <div className="desktop-pairing__title">{t('desktopPageTitle')}</div>
-        <div className="desktop-pairing__subtitle">
-          {t('desktopPageSubTitle')}
-        </div>
-      </div>
-      <div className="desktop-pairing">{renderContent()}</div>
+    <Box
+      display={DISPLAY.FLEX}
+      flexDirection="column"
+      alignItems={AlignItems.center}
+      marginLeft={2}
+      marginRight={2}
+    >
+      {renderIcon()}
+      {renderContent()}
       {renderFooter()}
-    </div>
+    </Box>
   );
 }
 
diff --git a/ui/pages/desktop-pairing/index.scss b/ui/pages/desktop-pairing/index.scss
index cf634e8fb..46603a259 100644
--- a/ui/pages/desktop-pairing/index.scss
+++ b/ui/pages/desktop-pairing/index.scss
@@ -3,126 +3,39 @@
   flex-flow: column;
   align-items: center;
   padding: 0 30px 0;
+  max-width: 640px;
 
   &__countdown-timer {
-    background: #f2f3f4;
-    border-radius: 15.5px;
-    padding: 7px 0 7px 0;
-    margin: 0 32px 0 32px;
+    background: var(--color-background-default);
+    border-radius: 16px;
+    padding: 8px 0;
     font-size: 12px;
+    width: 240px;
   }
 
   &__countdown-timer-seconds {
     color: var(--color-primary-default);
   }
 
-  &__icon {
-    padding-top: 24px;
-  }
-
-  &__title {
-    font-style: normal;
-    font-weight: 700;
-    font-size: 24px;
-    line-height: 140.62%;
-    text-align: center;
-    color: #24292e;
-    padding-top: 24px;
-  }
-
-  &__subtitle,
-  &__description {
-    font-style: normal;
-    font-weight: 400;
-    font-size: 14px;
-    line-height: 140.62%;
-    text-align: center;
-    color: #000;
-    padding-top: 8px;
-    margin: 0 56px;
-  }
-
-  &__description {
-    margin: 18px 0;
-  }
-
   &__otp {
     font-style: normal;
     font-weight: 500;
     font-size: 48px;
+    line-height: 48px;
     letter-spacing: 10px;
-    color: #000;
-  }
-
-  &__buttons {
-    display: flex;
-    width: 70%;
-    justify-content: space-between;
-    margin: auto;
   }
 
   &__tooltip-wrapper {
     width: 100%;
   }
 
-  &__clickable {
-    width: 100%;
+  &__clickable:hover {
+    cursor: pointer;
+  }
 
-    &:hover {
-      cursor: pointer;
-    }
-  }
-}
-
-.desktop-pairing-warning {
-  font-style: normal;
-  font-weight: 400;
-  font-size: 14px;
-
-  &__close-button {
-    z-index: 1050;
-    font-size: 24px;
-    cursor: pointer;
-
-    &__close::after {
-      content: '\00D7';
-      font-size: 24px;
-      cursor: pointer;
-      position: relative;
-      float: right;
-      margin-top: -8px;
-    }
-  }
-
-  &__title {
-    font-weight: bold;
-    font-size: 16px;
-  }
-
-  &__text {
-    font-size: 0.875rem;
-  }
-
-  &__link {
-    color: var(--color-primary-default);
-    display: block;
-    cursor: pointer;
-    line-height: 100%;
-    font-size: 0.875rem;
-    padding: 0 0;
-  }
-
-  &__warning-content {
-    border-left: 5px solid var(--color-warning-default);
-    border-right: 0;
-    border-bottom: 0;
-    border-top: 0;
-    margin: 4px;
-
-    .icon {
-      position: absolute;
-      left: 5px;
-      top: 10px;
+  &__icon {
+    path {
+      fill: var(--color-text-default);
     }
   }
 }

From d2b44a338d22fb1728264ce4243537c95f7c5ad8 Mon Sep 17 00:00:00 2001
From: Goktug Poyraz <goktug.poyraz@consensys.net>
Date: Mon, 20 Mar 2023 14:17:40 +0100
Subject: [PATCH 072/129] fix: download link

---
 shared/lib/error-utils.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/shared/lib/error-utils.js b/shared/lib/error-utils.js
index b04a2f72a..b473b57b4 100644
--- a/shared/lib/error-utils.js
+++ b/shared/lib/error-utils.js
@@ -121,13 +121,16 @@ export async function getErrorHtml(
 }
 
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
+const MMD_DOWNLOAD_LINK =
+  'https://github.com/MetaMask/metamask-desktop/releases';
+
 function disableDesktop(backgroundConnection) {
   backgroundConnection.disableDesktopError();
 }
 
 export function downloadDesktopApp() {
   global.platform.openTab({
-    url: 'https://github.com/MetaMask/metamask-desktop/releases',
+    url: MMD_DOWNLOAD_LINK,
   });
 }
 
@@ -141,7 +144,7 @@ export function restartExtension() {
 
 export function openOrDownloadMMD() {
   openCustomProtocol('metamask-desktop://pair').catch(() => {
-    window.open('https://metamask.io/download.html', '_blank').focus();
+    window.open(MMD_DOWNLOAD_LINK, '_blank').focus();
   });
 }
 

From c1b607bdba4be224d7c1c57ffd9565a37b4cb6d4 Mon Sep 17 00:00:00 2001
From: Goktug Poyraz <goktug.poyraz@consensys.net>
Date: Mon, 20 Mar 2023 14:28:46 +0100
Subject: [PATCH 073/129] Fix: add tests

---
 shared/lib/error-utils.js                     |   2 +-
 shared/lib/error-utils.test.js                | 126 +++++++++++++++++-
 .../desktop-pairing/desktop-pairing.test.js   |  56 +++++++-
 3 files changed, 181 insertions(+), 3 deletions(-)

diff --git a/shared/lib/error-utils.js b/shared/lib/error-utils.js
index b473b57b4..631fd04b0 100644
--- a/shared/lib/error-utils.js
+++ b/shared/lib/error-utils.js
@@ -121,7 +121,7 @@ export async function getErrorHtml(
 }
 
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
-const MMD_DOWNLOAD_LINK =
+export const MMD_DOWNLOAD_LINK =
   'https://github.com/MetaMask/metamask-desktop/releases';
 
 function disableDesktop(backgroundConnection) {
diff --git a/shared/lib/error-utils.test.js b/shared/lib/error-utils.test.js
index de846aa8b..f761acd10 100644
--- a/shared/lib/error-utils.test.js
+++ b/shared/lib/error-utils.test.js
@@ -1,13 +1,48 @@
+import browser from 'webextension-polyfill';
 import { fetchLocale } from '../../ui/helpers/utils/i18n-helper';
 import { SUPPORT_LINK } from './ui-utils';
-import { getErrorHtml } from './error-utils';
+import {
+  downloadDesktopApp,
+  openOrDownloadMMD,
+  downloadExtension,
+  getErrorHtml,
+  restartExtension,
+  registerDesktopErrorActions,
+  MMD_DOWNLOAD_LINK,
+} from './error-utils';
+import { openCustomProtocol } from './deep-linking';
 
 jest.mock('../../ui/helpers/utils/i18n-helper', () => ({
   fetchLocale: jest.fn(),
   loadRelativeTimeFormatLocaleData: jest.fn(),
 }));
+jest.mock('./deep-linking', () => ({
+  openCustomProtocol: jest.fn(),
+}));
+
+jest.mock('webextension-polyfill', () => {
+  return {
+    runtime: {
+      reload: jest.fn(),
+    },
+  };
+});
 
 describe('Error utils Tests', function () {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.restoreAllMocks();
+
+    global.platform = {
+      openTab: jest.fn(),
+    };
+  });
+
+  afterAll(() => {
+    jest.clearAllMocks();
+    jest.restoreAllMocks();
+    delete global.platform;
+  });
   it('should get error html', async function () {
     const mockStore = {
       localeMessages: {
@@ -50,4 +85,93 @@ describe('Error utils Tests', function () {
     expect(errorHtml).toContain(stillGettingMessageMessage);
     expect(errorHtml).toContain(sendBugReportMessage);
   });
+  describe('desktop', () => {
+    it('downloadDesktopApp opens a new tab on metamask-desktop releases url', () => {
+      downloadDesktopApp();
+
+      expect(global.platform.openTab).toHaveBeenCalledTimes(1);
+      expect(global.platform.openTab).toHaveBeenCalledWith({
+        url: MMD_DOWNLOAD_LINK,
+      });
+    });
+
+    it('downloadExtension opens a new tab on metamask extension url', () => {
+      downloadExtension();
+
+      expect(global.platform.openTab).toHaveBeenCalledTimes(1);
+      expect(global.platform.openTab).toHaveBeenCalledWith({
+        url: 'https://metamask.io/',
+      });
+    });
+
+    it('restartExtension calls runtime reload method', () => {
+      restartExtension();
+
+      expect(browser.runtime.reload).toHaveBeenCalledTimes(1);
+    });
+
+    describe('openOrDownloadMMD', () => {
+      it('launches installed desktop app by calling openCustomProtocol successfully', () => {
+        openCustomProtocol.mockResolvedValue();
+        openOrDownloadMMD();
+
+        expect(openCustomProtocol).toHaveBeenCalledTimes(1);
+        expect(openCustomProtocol).toHaveBeenCalledWith(
+          'metamask-desktop://pair',
+        );
+      });
+
+      it('opens metamask-desktop release url when fails to find and start a local metamask-desktop app', async () => {
+        openCustomProtocol.mockRejectedValue();
+        const focusMock = jest.fn();
+        jest.spyOn(window, 'open').mockReturnValue({
+          focus: focusMock,
+        });
+
+        openOrDownloadMMD();
+
+        // this ensures that we are awaiting for pending promises to resolve
+        // as the openOrDownloadMMD calls a promise, but returns before it is resolved
+        await new Promise(process.nextTick);
+
+        expect(openCustomProtocol).toHaveBeenCalledTimes(1);
+        expect(openCustomProtocol).toHaveBeenCalledWith(
+          'metamask-desktop://pair',
+        );
+
+        expect(window.open).toHaveBeenCalledTimes(1);
+        expect(window.open).toHaveBeenCalledWith(MMD_DOWNLOAD_LINK, '_blank');
+        expect(focusMock).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    it('registerDesktopErrorActions add click event listeners for each desktop error elements', async () => {
+      const addEventListenerMock = jest.fn();
+      jest.spyOn(document, 'getElementById').mockReturnValue({
+        addEventListener: addEventListenerMock,
+      });
+
+      registerDesktopErrorActions();
+
+      expect(document.getElementById).toHaveBeenCalledTimes(4);
+      expect(document.getElementById).toHaveBeenNthCalledWith(
+        1,
+        'desktop-error-button-disable-mmd',
+      );
+      expect(document.getElementById).toHaveBeenNthCalledWith(
+        2,
+        'desktop-error-button-restart-mm',
+      );
+      expect(document.getElementById).toHaveBeenNthCalledWith(
+        3,
+        'desktop-error-button-download-mmd',
+      );
+      expect(document.getElementById).toHaveBeenNthCalledWith(
+        4,
+        'desktop-error-button-open-or-download-mmd',
+      );
+
+      expect(addEventListenerMock).toHaveBeenCalledTimes(4);
+    });
+  });
 });
diff --git a/ui/pages/desktop-pairing/desktop-pairing.test.js b/ui/pages/desktop-pairing/desktop-pairing.test.js
index 371b13e64..12a7be2b1 100644
--- a/ui/pages/desktop-pairing/desktop-pairing.test.js
+++ b/ui/pages/desktop-pairing/desktop-pairing.test.js
@@ -1,11 +1,12 @@
 import React from 'react';
 import reactRouterDom from 'react-router-dom';
-import { waitFor, act, screen } from '@testing-library/react';
+import { waitFor, act, screen, fireEvent } from '@testing-library/react';
 import actions from '../../store/actions';
 import configureStore from '../../store/store';
 import { renderWithProvider } from '../../../test/jest';
 import mockState from '../../../test/data/mock-state.json';
 import { SECOND } from '../../../shared/constants/time';
+import { useCopyToClipboard } from '../../hooks/useCopyToClipboard';
 import DesktopPairingPage from '.';
 
 const mockHideLoadingIndication = jest.fn();
@@ -19,10 +20,13 @@ jest.mock('../../store/actions', () => {
   };
 });
 
+jest.mock('../../hooks/useCopyToClipboard');
+
 const mockedActions = actions;
 
 describe('Desktop Pairing page', () => {
   const mockHistoryPush = jest.fn();
+  const handleCopy = jest.fn();
 
   function flushPromises() {
     // Wait for promises running in the non-async timer callback to complete.
@@ -35,6 +39,7 @@ describe('Desktop Pairing page', () => {
       .spyOn(reactRouterDom, 'useHistory')
       .mockImplementation()
       .mockReturnValue({ push: mockHistoryPush });
+    useCopyToClipboard.mockReturnValue([false, handleCopy]);
   });
 
   afterEach(() => {
@@ -107,4 +112,53 @@ describe('Desktop Pairing page', () => {
     jest.clearAllTimers();
     jest.useRealTimers();
   });
+
+  it('should copy otp value when content is clicked', async () => {
+    const otp = '123456';
+    mockedActions.generateDesktopOtp.mockResolvedValue(otp);
+
+    const store = configureStore(mockState);
+
+    act(() => {
+      renderWithProvider(<DesktopPairingPage />, store);
+    });
+
+    await waitFor(() => {
+      expect(screen.getByTestId('desktop-pairing-otp-content')).toBeDefined();
+      expect(screen.getByText(otp)).toBeDefined();
+    });
+
+    act(() => {
+      fireEvent.click(screen.getByTestId('desktop-pairing-otp-content'));
+    });
+
+    await waitFor(() => {
+      expect(handleCopy).toHaveBeenCalledWith(otp);
+    });
+  });
+
+  it('should return to previews page when the done button is clicked', async () => {
+    const otp = '123456';
+    const mostRecentOverviewPage = '/mostRecentOverviewPage';
+    mockedActions.generateDesktopOtp.mockResolvedValue(otp);
+
+    const store = configureStore(mockState);
+
+    act(() => {
+      renderWithProvider(<DesktopPairingPage />, store);
+    });
+
+    await waitFor(() => {
+      expect(screen.getByTestId('desktop-pairing-otp-content')).toBeDefined();
+    });
+
+    act(() => {
+      fireEvent.click(screen.getByText('Done'));
+    });
+
+    await waitFor(() => {
+      expect(mockHistoryPush).toHaveBeenCalledTimes(1);
+      expect(mockHistoryPush).toHaveBeenCalledWith(mostRecentOverviewPage);
+    });
+  });
 });

From 3a1bcf14466b40cec1d7a2a155a0479a891880e1 Mon Sep 17 00:00:00 2001
From: Goktug Poyraz <goktug.poyraz@consensys.net>
Date: Tue, 21 Mar 2023 13:09:13 +0100
Subject: [PATCH 074/129] Adds desktop pairing page story and fix suggestions

---
 .../desktop-pairing.test.js.snap              | 14 ++++-----
 .../desktop-pairing.component.js              | 27 +++++++++--------
 .../desktop-pairing.stories.js                | 30 +++++++++++++++++++
 ui/pages/desktop-pairing/index.scss           | 17 ++---------
 4 files changed, 52 insertions(+), 36 deletions(-)
 create mode 100644 ui/pages/desktop-pairing/desktop-pairing.stories.js

diff --git a/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap b/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap
index c3a42d035..586e81444 100644
--- a/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap
+++ b/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap
@@ -117,12 +117,12 @@ exports[`Desktop Pairing page should render otp component 1`] = `
           style="display: inline;"
           tabindex="0"
         >
-          <p
+          <h1
             align="center"
-            class="box mm-text desktop-pairing__otp mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+            class="box mm-text desktop-pairing__otp mm-text--display-md mm-text--color-text-default box--flex-direction-row"
           >
             123456
-          </p>
+          </h1>
         </div>
       </div>
       <div
@@ -130,7 +130,7 @@ exports[`Desktop Pairing page should render otp component 1`] = `
       >
         <p
           align="center"
-          class="box mm-text desktop-pairing__countdown-timer mm-text--body-md mm-text--color-text-default box--flex-direction-row"
+          class="box mm-text desktop-pairing__countdown-timer mm-text--body-md mm-text--color-text-default box--padding-2 box--flex-direction-row box--background-color-background-default box--rounded-xl"
         >
           <span>
              
@@ -153,12 +153,10 @@ exports[`Desktop Pairing page should render otp component 1`] = `
       </p>
     </div>
     <div
-      class="box box--flex-direction-row box--width-1/2"
+      class="box box--flex-direction-row"
     >
       <button
-        class="button btn--rounded btn-primary"
-        role="button"
-        tabindex="0"
+        class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-default box--rounded-pill"
       >
         Done
       </button>
diff --git a/ui/pages/desktop-pairing/desktop-pairing.component.js b/ui/pages/desktop-pairing/desktop-pairing.component.js
index 098976b66..c529aa261 100644
--- a/ui/pages/desktop-pairing/desktop-pairing.component.js
+++ b/ui/pages/desktop-pairing/desktop-pairing.component.js
@@ -1,7 +1,6 @@
 import React, { useState, useEffect, useRef, useContext } from 'react';
 import { useHistory } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import Button from '../../components/ui/button';
 import { SECOND } from '../../../shared/constants/time';
 import { I18nContext } from '../../contexts/i18n';
 import IconDesktopPairing from '../../components/ui/icon/icon-desktop-pairing';
@@ -10,13 +9,14 @@ import {
   TextVariant,
   DISPLAY,
   AlignItems,
-  BLOCK_SIZES,
   JustifyContent,
+  BackgroundColor,
+  BorderRadius,
 } from '../../helpers/constants/design-system';
 import Box from '../../components/ui/box/box';
 import { useCopyToClipboard } from '../../hooks/useCopyToClipboard';
 import Tooltip from '../../components/ui/tooltip';
-import { Text } from '../../components/component-library';
+import { Text, Button } from '../../components/component-library';
 
 export default function DesktopPairingPage({
   generateDesktopOtp,
@@ -104,11 +104,7 @@ export default function DesktopPairingPage({
         <Text variant={TextVariant.headingMd} align={TEXT_ALIGN.CENTER}>
           {t('desktopPageTitle')}
         </Text>
-        <Text
-          marginTop={2}
-          variant={TextVariant.bodyMd}
-          align={TEXT_ALIGN.CENTER}
-        >
+        <Text marginTop={2} align={TEXT_ALIGN.CENTER}>
           {t('desktopPageSubTitle')}
         </Text>
         <Box
@@ -125,7 +121,11 @@ export default function DesktopPairingPage({
             position="top"
             title={copied ? t('copiedExclamation') : t('copyToClipboard')}
           >
-            <Text align={TEXT_ALIGN.CENTER} className="desktop-pairing__otp">
+            <Text
+              align={TEXT_ALIGN.CENTER}
+              variant={TextVariant.displayMd}
+              className="desktop-pairing__otp"
+            >
               {otp}
             </Text>
           </Tooltip>
@@ -137,9 +137,12 @@ export default function DesktopPairingPage({
             marginBottom={6}
           >
             <Text
+              className="desktop-pairing__countdown-timer"
               variant={TextVariant.paragraph}
               align={TEXT_ALIGN.CENTER}
-              className="desktop-pairing__countdown-timer"
+              backgroundColor={BackgroundColor.backgroundDefault}
+              borderRadius={BorderRadius.XL}
+              padding={2}
             >
               {t('desktopPairingExpireMessage', [
                 <span
@@ -161,10 +164,8 @@ export default function DesktopPairingPage({
 
   const renderFooter = () => {
     return (
-      <Box width={BLOCK_SIZES.HALF}>
+      <Box>
         <Button
-          type="primary"
-          rounded
           onClick={() => {
             goBack();
           }}
diff --git a/ui/pages/desktop-pairing/desktop-pairing.stories.js b/ui/pages/desktop-pairing/desktop-pairing.stories.js
new file mode 100644
index 000000000..0c4163125
--- /dev/null
+++ b/ui/pages/desktop-pairing/desktop-pairing.stories.js
@@ -0,0 +1,30 @@
+import React from 'react';
+import DesktopPairingPage from './desktop-pairing.component';
+
+export default {
+  title: 'Pages/DesktopPairingPage',
+  component: DesktopPairingPage,
+  argTypes: {
+    showLoadingIndication: {
+      action: 'showLoadingIndication',
+    },
+    hideLoadingIndication: {
+      action: 'hideLoadingIndication',
+    },
+    generateDesktopOtp: {
+      action: 'generateDesktopOtp',
+    },
+  },
+  args: {
+    mostRecentOverviewPage: '/',
+  },
+};
+
+export const DefaultStory = (args) => {
+  const generateDesktopOtp = async () => Promise.resolve('123456');
+  return (
+    <DesktopPairingPage {...args} generateDesktopOtp={generateDesktopOtp} />
+  );
+};
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/pages/desktop-pairing/index.scss b/ui/pages/desktop-pairing/index.scss
index 46603a259..9ab031555 100644
--- a/ui/pages/desktop-pairing/index.scss
+++ b/ui/pages/desktop-pairing/index.scss
@@ -1,27 +1,14 @@
 .desktop-pairing {
-  display: flex;
-  flex-flow: column;
-  align-items: center;
-  padding: 0 30px 0;
-  max-width: 640px;
-
   &__countdown-timer {
-    background: var(--color-background-default);
-    border-radius: 16px;
-    padding: 8px 0;
     font-size: 12px;
-    width: 240px;
   }
 
   &__countdown-timer-seconds {
     color: var(--color-primary-default);
+    min-width: 180px;
   }
 
   &__otp {
-    font-style: normal;
-    font-weight: 500;
-    font-size: 48px;
-    line-height: 48px;
     letter-spacing: 10px;
   }
 
@@ -35,7 +22,7 @@
 
   &__icon {
     path {
-      fill: var(--color-text-default);
+      fill: var(--color-icon-default);
     }
   }
 }

From c640e769b2ba01195a5453e290a33cda90d43df8 Mon Sep 17 00:00:00 2001
From: Goktug Poyraz <goktug.poyraz@consensys.net>
Date: Tue, 28 Mar 2023 10:36:53 +0200
Subject: [PATCH 075/129] Update snapshot

---
 .../__snapshots__/desktop-pairing.test.js.snap       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap b/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap
index 586e81444..02937e6e2 100644
--- a/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap
+++ b/ui/pages/desktop-pairing/__snapshots__/desktop-pairing.test.js.snap
@@ -92,13 +92,13 @@ exports[`Desktop Pairing page should render otp component 1`] = `
     </div>
     <h3
       align="center"
-      class="box mm-text mm-text--heading-md mm-text--color-text-default box--flex-direction-row"
+      class="box mm-text mm-text--heading-md box--flex-direction-row box--color-text-default"
     >
       Pair with Desktop
     </h3>
     <p
       align="center"
-      class="box mm-text mm-text--body-md mm-text--color-text-default box--margin-top-2 box--flex-direction-row"
+      class="box mm-text mm-text--body-md box--margin-top-2 box--flex-direction-row box--color-text-default"
     >
       Open your MetaMask Desktop and type this code
     </p>
@@ -119,7 +119,7 @@ exports[`Desktop Pairing page should render otp component 1`] = `
         >
           <h1
             align="center"
-            class="box mm-text desktop-pairing__otp mm-text--display-md mm-text--color-text-default box--flex-direction-row"
+            class="box mm-text desktop-pairing__otp mm-text--display-md box--flex-direction-row box--color-text-default"
           >
             123456
           </h1>
@@ -130,7 +130,7 @@ exports[`Desktop Pairing page should render otp component 1`] = `
       >
         <p
           align="center"
-          class="box mm-text desktop-pairing__countdown-timer mm-text--body-md mm-text--color-text-default box--padding-2 box--flex-direction-row box--background-color-background-default box--rounded-xl"
+          class="box mm-text desktop-pairing__countdown-timer mm-text--body-md box--padding-2 box--flex-direction-row box--color-text-default box--background-color-background-default box--rounded-xl"
         >
           <span>
              
@@ -147,7 +147,7 @@ exports[`Desktop Pairing page should render otp component 1`] = `
       </div>
       <p
         align="center"
-        class="box mm-text mm-text--body-sm mm-text--color-text-default box--flex-direction-row"
+        class="box mm-text mm-text--body-sm box--flex-direction-row box--color-text-default"
       >
         If the pairing is successful, extension will restart and you'll have to re-enter your password.
       </p>
@@ -156,7 +156,7 @@ exports[`Desktop Pairing page should render otp component 1`] = `
       class="box box--flex-direction-row"
     >
       <button
-        class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md mm-text--color-primary-inverse box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--background-color-primary-default box--rounded-pill"
+        class="box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
       >
         Done
       </button>

From d4f04815c27853f85895915a246475af389f5054 Mon Sep 17 00:00:00 2001
From: seaona <54408225+seaona@users.noreply.github.com>
Date: Tue, 28 Mar 2023 14:59:41 +0200
Subject: [PATCH 076/129] Remove timeouts without effect (#18342)

---
 test/e2e/metamask-ui.spec.js                  | 22 +++++-------
 test/e2e/nft/erc721-interaction.spec.js       |  4 ---
 test/e2e/tests/address-book.spec.js           | 11 +++---
 test/e2e/tests/clear-activity.spec.js         | 16 ++++-----
 test/e2e/tests/contract-interactions.spec.js  | 35 +++++++------------
 test/e2e/tests/failing-contract.spec.js       |  2 --
 test/e2e/tests/from-import-ui.spec.js         | 11 +++---
 test/e2e/tests/metamask-responsive-ui.spec.js | 11 +++---
 test/e2e/tests/navigate-transactions.spec.js  | 33 +++++++----------
 test/e2e/tests/personal-sign.spec.js          | 11 +++---
 test/e2e/tests/send-eth.spec.js               | 13 +++----
 test/e2e/tests/send-hex-address.spec.js       |  2 --
 12 files changed, 60 insertions(+), 111 deletions(-)

diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index 6f3754bd8..6cc81b400 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -346,13 +346,10 @@ describe('MetaMask', function () {
     });
 
     it('finds the transaction in the transactions list', async function () {
-      await driver.waitForSelector(
-        {
-          css: '.transaction-list__completed-transactions .transaction-list-item__primary-currency',
-          text: '-1 TST',
-        },
-        { timeout: 10000 },
-      );
+      await driver.waitForSelector({
+        css: '.transaction-list__completed-transactions .transaction-list-item__primary-currency',
+        text: '-1 TST',
+      });
 
       await driver.waitForSelector({
         css: '.list-item__heading',
@@ -380,13 +377,10 @@ describe('MetaMask', function () {
       await driver.delay(largeDelayMs);
 
       await driver.findElements('.transaction-list__pending-transactions');
-      await driver.waitForSelector(
-        {
-          css: '.transaction-list-item__primary-currency',
-          text: '-1.5 TST',
-        },
-        { timeout: 10000 },
-      );
+      await driver.waitForSelector({
+        css: '.transaction-list-item__primary-currency',
+        text: '-1.5 TST',
+      });
       await driver.clickElement('.transaction-list-item__primary-currency');
       await driver.delay(regularDelayMs);
 
diff --git a/test/e2e/nft/erc721-interaction.spec.js b/test/e2e/nft/erc721-interaction.spec.js
index 967c33f1e..6e9a9e959 100644
--- a/test/e2e/nft/erc721-interaction.spec.js
+++ b/test/e2e/nft/erc721-interaction.spec.js
@@ -59,7 +59,6 @@ describe('ERC721 NFTs testdapp interaction', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // Verify transaction
@@ -130,7 +129,6 @@ describe('ERC721 NFTs testdapp interaction', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // Verify transaction
@@ -202,7 +200,6 @@ describe('ERC721 NFTs testdapp interaction', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // Verify transaction
@@ -277,7 +274,6 @@ describe('ERC721 NFTs testdapp interaction', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // Verify transaction
diff --git a/test/e2e/tests/address-book.spec.js b/test/e2e/tests/address-book.spec.js
index 9184afb04..af1214521 100644
--- a/test/e2e/tests/address-book.spec.js
+++ b/test/e2e/tests/address-book.spec.js
@@ -63,13 +63,10 @@ describe('Address Book', function () {
           return confirmedTxes.length === 1;
         }, 10000);
 
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-2 ETH',
-          },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-2 ETH',
+        });
       },
     );
   });
diff --git a/test/e2e/tests/clear-activity.spec.js b/test/e2e/tests/clear-activity.spec.js
index 12903510c..a16254c9c 100644
--- a/test/e2e/tests/clear-activity.spec.js
+++ b/test/e2e/tests/clear-activity.spec.js
@@ -34,14 +34,14 @@ describe('Clear account activity', function () {
 
         // Check send transaction and receive transaction history are all displayed
         await driver.clickElement('[data-testid="home__activity-tab"]');
-        await driver.waitForSelector(
-          { css: '.list-item__title', text: 'Send' },
-          { timeout: 10000 },
-        );
-        await driver.waitForSelector(
-          { css: '.list-item__title', text: 'Receive' },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.list-item__title',
+          text: 'Send',
+        });
+        await driver.waitForSelector({
+          css: '.list-item__title',
+          text: 'Receive',
+        });
 
         // Clear activity and nonce data
         await driver.clickElement('.account-menu__icon');
diff --git a/test/e2e/tests/contract-interactions.spec.js b/test/e2e/tests/contract-interactions.spec.js
index b13fe9826..dbfcd5259 100644
--- a/test/e2e/tests/contract-interactions.spec.js
+++ b/test/e2e/tests/contract-interactions.spec.js
@@ -63,15 +63,11 @@ describe('Deploy contract and call contract methods', function () {
         await driver.clickElement({ text: 'Activity', tag: 'button' });
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
-        );
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-4 ETH',
-          },
-          { timeout: 10000 },
         );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-4 ETH',
+        });
 
         // calls and confirms a contract method where ETH is received
         await driver.switchToWindow(dapp);
@@ -87,26 +83,19 @@ describe('Deploy contract and call contract methods', function () {
         await driver.switchToWindow(extension);
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(2)',
-          { timeout: 10000 },
-        );
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-0 ETH',
-          },
-          { timeout: 10000 },
         );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-0 ETH',
+        });
 
         // renders the correct ETH balance
         await driver.switchToWindow(extension);
         const balance = await ganacheServer.getBalance();
-        const balanceElement = await driver.waitForSelector(
-          {
-            css: '[data-testid="eth-overview__primary-currency"]',
-            text: balance,
-          },
-          { timeout: 10000 },
-        );
+        const balanceElement = await driver.waitForSelector({
+          css: '[data-testid="eth-overview__primary-currency"]',
+          text: balance,
+        });
         assert.equal(`${balance}\nETH`, await balanceElement.getText());
       },
     );
diff --git a/test/e2e/tests/failing-contract.spec.js b/test/e2e/tests/failing-contract.spec.js
index 3391d878e..7f0dd766e 100644
--- a/test/e2e/tests/failing-contract.spec.js
+++ b/test/e2e/tests/failing-contract.spec.js
@@ -71,7 +71,6 @@ describe('Failing contract interaction ', function () {
         await driver.clickElement({ text: 'Activity', tag: 'button' });
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // display the transaction status
@@ -157,7 +156,6 @@ describe('Failing contract interaction on non-EIP1559 network', function () {
         await driver.clickElement({ text: 'Activity', tag: 'button' });
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // display the transaction status
diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js
index e56882c05..892453c17 100644
--- a/test/e2e/tests/from-import-ui.spec.js
+++ b/test/e2e/tests/from-import-ui.spec.js
@@ -267,13 +267,10 @@ describe('MetaMask Import UI', function () {
         await driver.clickElement({ text: 'Remove', tag: 'button' });
 
         // Wait until selected account switches away from removed account to first account
-        await driver.waitForSelector(
-          {
-            css: '.selected-account__name',
-            text: 'Account 1',
-          },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.selected-account__name',
+          text: 'Account 1',
+        });
 
         await driver.delay(regularDelayMs);
         await driver.clickElement('.account-menu__icon');
diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js
index 36811bc38..4c83081c2 100644
--- a/test/e2e/tests/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/metamask-responsive-ui.spec.js
@@ -163,13 +163,10 @@ describe('MetaMask Responsive UI', function () {
           return confirmedTxes.length === 1;
         }, 10000);
 
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-1 ETH',
-          },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-1 ETH',
+        });
       },
     );
   });
diff --git a/test/e2e/tests/navigate-transactions.spec.js b/test/e2e/tests/navigate-transactions.spec.js
index 3e272838d..9a0011b34 100644
--- a/test/e2e/tests/navigate-transactions.spec.js
+++ b/test/e2e/tests/navigate-transactions.spec.js
@@ -136,13 +136,10 @@ describe('Navigate transactions', function () {
         const windowHandles = await driver.getAllWindowHandles();
         const extension = windowHandles[0];
         await driver.switchToWindow(extension);
-        navigationElement = await driver.waitForSelector(
-          {
-            css: '.confirm-page-container-navigation',
-            text: '2 of 5',
-          },
-          { timeout: 10000 },
-        );
+        navigationElement = await driver.waitForSelector({
+          css: '.confirm-page-container-navigation',
+          text: '2 of 5',
+        });
         navigationText = await navigationElement.getText();
         assert.equal(
           navigationText.includes('2 of 5'),
@@ -169,13 +166,10 @@ describe('Navigate transactions', function () {
 
         // reject transaction
         await driver.clickElement({ text: 'Reject', tag: 'button' });
-        const navigationElement = await driver.waitForSelector(
-          {
-            css: '.confirm-page-container-navigation',
-            text: '1 of 3',
-          },
-          { timeout: 10000 },
-        );
+        const navigationElement = await driver.waitForSelector({
+          css: '.confirm-page-container-navigation',
+          text: '1 of 3',
+        });
         const navigationText = await navigationElement.getText();
         assert.equal(
           navigationText.includes('1 of 3'),
@@ -202,13 +196,10 @@ describe('Navigate transactions', function () {
 
         // confirm transaction
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        const navigationElement = await driver.waitForSelector(
-          {
-            css: '.confirm-page-container-navigation',
-            text: '1 of 3',
-          },
-          { timeout: 10000 },
-        );
+        const navigationElement = await driver.waitForSelector({
+          css: '.confirm-page-container-navigation',
+          text: '1 of 3',
+        });
         const navigationText = await navigationElement.getText();
         assert.equal(
           navigationText.includes('1 of 3'),
diff --git a/test/e2e/tests/personal-sign.spec.js b/test/e2e/tests/personal-sign.spec.js
index 1a6d904f2..86f798c67 100644
--- a/test/e2e/tests/personal-sign.spec.js
+++ b/test/e2e/tests/personal-sign.spec.js
@@ -57,13 +57,10 @@ describe('Personal sign', function () {
         const verifySigUtil = await driver.findElement(
           '#personalSignVerifySigUtilResult',
         );
-        const verifyECRecover = await driver.waitForSelector(
-          {
-            css: '#personalSignVerifyECRecoverResult',
-            text: publicAddress,
-          },
-          { timeout: 10000 },
-        );
+        const verifyECRecover = await driver.waitForSelector({
+          css: '#personalSignVerifyECRecoverResult',
+          text: publicAddress,
+        });
         assert.equal(await verifySigUtil.getText(), publicAddress);
         assert.equal(await verifyECRecover.getText(), publicAddress);
       },
diff --git a/test/e2e/tests/send-eth.spec.js b/test/e2e/tests/send-eth.spec.js
index d5005dcf3..dbe952963 100644
--- a/test/e2e/tests/send-eth.spec.js
+++ b/test/e2e/tests/send-eth.spec.js
@@ -196,13 +196,10 @@ describe('Send ETH from inside MetaMask using advanced gas modal', function () {
           return confirmedTxes.length === 1;
         }, 10000);
 
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-1 ETH',
-          },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-1 ETH',
+        });
       },
     );
   });
@@ -275,7 +272,6 @@ describe('Send ETH from dapp using advanced gas controls', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
         await driver.waitForSelector({
           css: '.transaction-list-item__primary-currency',
@@ -345,7 +341,6 @@ describe('Send ETH from dapp using advanced gas controls', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
         await driver.waitForSelector({
           css: '.transaction-list-item__primary-currency',
diff --git a/test/e2e/tests/send-hex-address.spec.js b/test/e2e/tests/send-hex-address.spec.js
index 3e03dfd31..08d7b2c1d 100644
--- a/test/e2e/tests/send-hex-address.spec.js
+++ b/test/e2e/tests/send-hex-address.spec.js
@@ -168,7 +168,6 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
         const sendTransactionListItem = await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
@@ -234,7 +233,6 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
         const sendTransactionListItem = await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',

From 8cba64b993feb1e6c4fece1fa13bac7267438cde Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 28 Mar 2023 09:50:02 -0500
Subject: [PATCH 077/129] Remove isEIP1559Account usage (#18064)

---
 ui/selectors/selectors.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 425107475..21db5560f 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -177,10 +177,6 @@ export function getCurrentKeyring(state) {
   return keyring;
 }
 
-export function isEIP1559Account() {
-  return true;
-}
-
 /**
  * The function returns true if network and account details are fetched and
  * both of them support EIP-1559.
@@ -189,9 +185,7 @@ export function isEIP1559Account() {
  */
 export function checkNetworkAndAccountSupports1559(state) {
   const networkSupports1559 = isEIP1559Network(state);
-  const accountSupports1559 = isEIP1559Account(state);
-
-  return networkSupports1559 && accountSupports1559;
+  return networkSupports1559;
 }
 
 /**
@@ -202,9 +196,7 @@ export function checkNetworkAndAccountSupports1559(state) {
  */
 export function checkNetworkOrAccountNotSupports1559(state) {
   const networkNotSupports1559 = isNotEIP1559Network(state);
-  const accountSupports1559 = isEIP1559Account(state);
-
-  return networkNotSupports1559 || accountSupports1559 === false;
+  return networkNotSupports1559;
 }
 
 /**

From 870415f11152ff6cf3b61affff33032bab3d3bbf Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 28 Mar 2023 14:59:18 -0500
Subject: [PATCH 078/129] UX: Multichain: Global Action Menu (#18158)

---
 app/_locales/en/messages.json                 |   6 +
 ui/components/app/menu-bar/menu-bar.js        |  19 ++-
 .../multichain/global-menu/global-menu.js     | 155 ++++++++++++++++++
 .../global-menu/global-menu.stories.js        |  22 +++
 .../global-menu/global-menu.test.js           |  69 ++++++++
 ui/components/multichain/global-menu/index.js |   1 +
 ui/components/multichain/index.js             |   1 +
 7 files changed, 267 insertions(+), 6 deletions(-)
 create mode 100644 ui/components/multichain/global-menu/global-menu.js
 create mode 100644 ui/components/multichain/global-menu/global-menu.stories.js
 create mode 100644 ui/components/multichain/global-menu/global-menu.test.js
 create mode 100644 ui/components/multichain/global-menu/index.js

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 5770bc805..cf2ebbab5 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1967,6 +1967,9 @@
   "lock": {
     "message": "Lock"
   },
+  "lockMetaMask": {
+    "message": "Lock MetaMask"
+  },
   "lockTimeTooGreat": {
     "message": "Lock time is too great"
   },
@@ -2949,6 +2952,9 @@
   "portfolio": {
     "message": "Portfolio"
   },
+  "portfolioView": {
+    "message": "Portfolio view"
+  },
   "preferredLedgerConnectionType": {
     "message": "Preferred Ledger connection type",
     "description": "A header for a dropdown in Settings > Advanced. Appears above the ledgerConnectionPreferenceDescription message"
diff --git a/ui/components/app/menu-bar/menu-bar.js b/ui/components/app/menu-bar/menu-bar.js
index 548d3e7e1..bf80cad5d 100644
--- a/ui/components/app/menu-bar/menu-bar.js
+++ b/ui/components/app/menu-bar/menu-bar.js
@@ -12,6 +12,7 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getOriginOfCurrentTab } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { ButtonIcon, ICON_NAMES } from '../../component-library';
+import { GlobalMenu } from '../../multichain/global-menu';
 import AccountOptionsMenu from './account-options-menu';
 
 export default function MenuBar() {
@@ -53,12 +54,18 @@ export default function MenuBar() {
           }}
         />
       </span>
-      {accountOptionsMenuOpen ? (
-        <AccountOptionsMenu
-          anchorElement={ref.current}
-          onClose={() => setAccountOptionsMenuOpen(false)}
-        />
-      ) : null}
+      {accountOptionsMenuOpen &&
+        (process.env.MULTICHAIN ? (
+          <GlobalMenu
+            anchorElement={ref.current}
+            closeMenu={() => setAccountOptionsMenuOpen(false)}
+          />
+        ) : (
+          <AccountOptionsMenu
+            anchorElement={ref.current}
+            onClose={() => setAccountOptionsMenuOpen(false)}
+          />
+        ))}
     </div>
   );
 }
diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js
new file mode 100644
index 000000000..4c2f738b9
--- /dev/null
+++ b/ui/components/multichain/global-menu/global-menu.js
@@ -0,0 +1,155 @@
+import React, { useContext } from 'react';
+import PropTypes from 'prop-types';
+import { useHistory } from 'react-router-dom';
+import { useDispatch } from 'react-redux';
+import {
+  CONNECTED_ROUTE,
+  SETTINGS_ROUTE,
+  DEFAULT_ROUTE,
+} from '../../../helpers/constants/routes';
+import { lockMetamask } from '../../../store/actions';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { ICON_NAMES } from '../../component-library';
+import { Menu, MenuItem } from '../../ui/menu';
+import { getEnvironmentType } from '../../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
+import { SUPPORT_LINK } from '../../../../shared/lib/ui-utils';
+
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  EVENT_NAMES,
+  EVENT,
+  CONTEXT_PROPS,
+} from '../../../../shared/constants/metametrics';
+
+export const GlobalMenu = ({ closeMenu, anchorElement }) => {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+  const trackEvent = useContext(MetaMetricsContext);
+  const history = useHistory();
+
+  return (
+    <Menu anchorElement={anchorElement} onHide={closeMenu}>
+      <MenuItem
+        iconName={ICON_NAMES.CONNECT}
+        onClick={() => {
+          history.push(CONNECTED_ROUTE);
+          trackEvent({
+            event: EVENT_NAMES.NAV_CONNECTED_SITES_OPENED,
+            category: EVENT.CATEGORIES.NAVIGATION,
+            properties: {
+              location: 'Account Options',
+            },
+          });
+          closeMenu();
+        }}
+      >
+        {t('connectedSites')}
+      </MenuItem>
+      <MenuItem
+        iconName={ICON_NAMES.DIAGRAM}
+        onClick={() => {
+          const portfolioUrl = process.env.PORTFOLIO_URL;
+          global.platform.openTab({
+            url: `${portfolioUrl}?metamaskEntry=ext`,
+          });
+          trackEvent(
+            {
+              category: EVENT.CATEGORIES.HOME,
+              event: EVENT_NAMES.PORTFOLIO_LINK_CLICKED,
+              properties: {
+                url: portfolioUrl,
+              },
+            },
+            {
+              contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+            },
+          );
+          closeMenu();
+        }}
+        data-testid="global-menu-portfolio"
+      >
+        {t('portfolioView')}
+      </MenuItem>
+      {getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN ? null : (
+        <MenuItem
+          iconName={ICON_NAMES.EXPAND}
+          onClick={() => {
+            global.platform.openExtensionInBrowser();
+            trackEvent({
+              event: EVENT_NAMES.APP_WINDOW_EXPANDED,
+              category: EVENT.CATEGORIES.NAVIGATION,
+              properties: {
+                location: 'Account Options',
+              },
+            });
+            closeMenu();
+          }}
+          data-testid="global-menu-expand"
+        >
+          {t('expandView')}
+        </MenuItem>
+      )}
+      <MenuItem
+        iconName={ICON_NAMES.MESSAGE_QUESTION}
+        onClick={() => {
+          global.platform.openTab({ url: SUPPORT_LINK });
+          trackEvent(
+            {
+              category: EVENT.CATEGORIES.HOME,
+              event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+              properties: {
+                url: SUPPORT_LINK,
+              },
+            },
+            {
+              contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+            },
+          );
+          closeMenu();
+        }}
+        data-testid="global-menu-support"
+      >
+        {t('support')}
+      </MenuItem>
+      <MenuItem
+        iconName={ICON_NAMES.SETTING}
+        onClick={() => {
+          history.push(SETTINGS_ROUTE);
+          trackEvent({
+            category: EVENT.CATEGORIES.NAVIGATION,
+            event: EVENT_NAMES.NAV_SETTINGS_OPENED,
+            properties: {
+              location: 'Main Menu',
+            },
+          });
+          closeMenu();
+        }}
+      >
+        {t('settings')}
+      </MenuItem>
+      <MenuItem
+        iconName={ICON_NAMES.LOCK}
+        onClick={() => {
+          dispatch(lockMetamask());
+          history.push(DEFAULT_ROUTE);
+          closeMenu();
+        }}
+        data-testid="global-menu-lock"
+      >
+        {t('lockMetaMask')}
+      </MenuItem>
+    </Menu>
+  );
+};
+
+GlobalMenu.propTypes = {
+  /**
+   * The element that the menu should display next to
+   */
+  anchorElement: PropTypes.instanceOf(window.Element),
+  /**
+   * Function that closes this menu
+   */
+  closeMenu: PropTypes.func.isRequired,
+};
diff --git a/ui/components/multichain/global-menu/global-menu.stories.js b/ui/components/multichain/global-menu/global-menu.stories.js
new file mode 100644
index 000000000..6206b21d1
--- /dev/null
+++ b/ui/components/multichain/global-menu/global-menu.stories.js
@@ -0,0 +1,22 @@
+import React from 'react';
+import { GlobalMenu } from '.';
+
+export default {
+  title: 'Components/Multichain/GlobalMenu',
+  component: GlobalMenu,
+  argTypes: {
+    closeMenu: {
+      action: 'closeMenu',
+    },
+    anchorElement: {
+      control: 'func',
+    },
+  },
+  args: {
+    closeMenu: () => console.log('Closing menu!'),
+    anchorElement: null,
+  },
+};
+
+export const DefaultStory = (args) => <GlobalMenu {...args} />;
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/multichain/global-menu/global-menu.test.js b/ui/components/multichain/global-menu/global-menu.test.js
new file mode 100644
index 000000000..f3ed60fd3
--- /dev/null
+++ b/ui/components/multichain/global-menu/global-menu.test.js
@@ -0,0 +1,69 @@
+import React from 'react';
+import { renderWithProvider, fireEvent, waitFor } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import { SUPPORT_LINK } from '../../../../shared/lib/ui-utils';
+import { GlobalMenu } from '.';
+
+const render = () => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+    },
+  });
+  return renderWithProvider(
+    <GlobalMenu anchorElement={document.body} closeMenu={() => undefined} />,
+    store,
+  );
+};
+
+const mockLockMetaMask = jest.fn();
+jest.mock('../../../store/actions', () => ({
+  lockMetamask: () => mockLockMetaMask,
+}));
+
+describe('AccountListItem', () => {
+  it('locks MetaMask when item is clicked', async () => {
+    render();
+    fireEvent.click(document.querySelector('[data-testid="global-menu-lock"]'));
+    await waitFor(() => {
+      expect(mockLockMetaMask).toHaveBeenCalled();
+    });
+  });
+
+  it('opens the portfolio site when item is clicked', async () => {
+    global.platform = { openTab: jest.fn() };
+
+    const { getByTestId } = render();
+    fireEvent.click(getByTestId('global-menu-portfolio'));
+    await waitFor(() => {
+      expect(global.platform.openTab).toHaveBeenCalledWith({
+        url: `${process.env.PORTFOLIO_URL}?metamaskEntry=ext`,
+      });
+    });
+  });
+
+  it('opens the support site when item is clicked', async () => {
+    global.platform = { openTab: jest.fn() };
+
+    const { getByTestId } = render();
+    fireEvent.click(getByTestId('global-menu-support'));
+    await waitFor(() => {
+      expect(global.platform.openTab).toHaveBeenCalledWith({
+        url: SUPPORT_LINK,
+      });
+    });
+  });
+
+  it('expands metamask to tab when item is clicked', async () => {
+    global.platform = { openExtensionInBrowser: jest.fn() };
+
+    render();
+    fireEvent.click(
+      document.querySelector('[data-testid="global-menu-expand"]'),
+    );
+    await waitFor(() => {
+      expect(global.platform.openExtensionInBrowser).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/ui/components/multichain/global-menu/index.js b/ui/components/multichain/global-menu/index.js
new file mode 100644
index 000000000..4850b1f92
--- /dev/null
+++ b/ui/components/multichain/global-menu/index.js
@@ -0,0 +1 @@
+export { GlobalMenu } from './global-menu';
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
index d34e42751..29562dc83 100644
--- a/ui/components/multichain/index.js
+++ b/ui/components/multichain/index.js
@@ -2,5 +2,6 @@ export { AccountListItem } from './account-list-item';
 export { AccountListItemMenu } from './account-list-item-menu';
 export { AccountListMenu } from './account-list-menu';
 export { DetectedTokensBanner } from './detected-token-banner';
+export { GlobalMenu } from './global-menu';
 export { MultichainImportTokenLink } from './multichain-import-token-link';
 export { MultichainTokenListItem } from './multichain-token-list-item';

From 6be18552abf59d25a3e1576d4b2c26b13556ae24 Mon Sep 17 00:00:00 2001
From: Youmna Jaza <youmnajaza@gmail.com>
Date: Wed, 29 Mar 2023 01:04:22 +0300
Subject: [PATCH 079/129] Updating Typography to Text (#17681)

Co-authored-by: georgewrmarshall <george.marshall@consensys.net>
---
 ui/components/app/add-network/add-network.js  | 60 ++++++++++---------
 .../confirm-page-container.component.js       | 23 +++++--
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/ui/components/app/add-network/add-network.js b/ui/components/app/add-network/add-network.js
index 165359087..816d1e92c 100644
--- a/ui/components/app/add-network/add-network.js
+++ b/ui/components/app/add-network/add-network.js
@@ -3,13 +3,11 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { I18nContext } from '../../../contexts/i18n';
 import Box from '../../ui/box';
-import Typography from '../../ui/typography';
 import {
   AlignItems,
   DISPLAY,
   FLEX_DIRECTION,
-  FONT_WEIGHT,
-  TypographyVariant,
+  TextVariant,
   JustifyContent,
   BorderRadius,
   BackgroundColor,
@@ -38,7 +36,7 @@ import { FEATURED_RPCS } from '../../../../shared/constants/network';
 import { ADD_NETWORK_ROUTE } from '../../../helpers/constants/routes';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
-import { Icon, ICON_NAMES, ICON_SIZES } from '../../component-library';
+import { Icon, ICON_NAMES, ICON_SIZES, Text } from '../../component-library';
 import { EVENT } from '../../../../shared/constants/metametrics';
 
 const AddNetwork = () => {
@@ -98,7 +96,7 @@ const AddNetwork = () => {
             <img src="images/info-fox.svg" />
           </Box>
           <Box>
-            <Typography variant={TypographyVariant.H7}>
+            <Text variant={TextVariant.bodySm} as="h6">
               {t('youHaveAddedAll', [
                 <a
                   key="link"
@@ -121,15 +119,16 @@ const AddNetwork = () => {
                       : history.push(ADD_NETWORK_ROUTE);
                   }}
                 >
-                  <Typography
-                    variant={TypographyVariant.H7}
+                  <Text
+                    variant={TextVariant.bodySm}
+                    as="h6"
                     color={TextColor.infoDefault}
                   >
                     {t('addMoreNetworks')}.
-                  </Typography>
+                  </Text>
                 </Button>,
               ])}
-            </Typography>
+            </Text>
           </Box>
         </Box>
       ) : (
@@ -144,19 +143,21 @@ const AddNetwork = () => {
               paddingBottom={2}
               className="add-network__header"
             >
-              <Typography
-                variant={TypographyVariant.H4}
+              <Text
+                variant={TextVariant.headingSm}
                 color={TextColor.textMuted}
+                as="h4"
               >
                 {t('networks')}
-              </Typography>
+              </Text>
               <span className="add-network__header__subtitle">{'  >  '}</span>
-              <Typography
-                variant={TypographyVariant.H4}
+              <Text
+                variant={TextVariant.headingSm}
+                as="h4"
                 color={TextColor.textDefault}
               >
                 {t('addANetwork')}
-              </Typography>
+              </Text>
             </Box>
           )}
           <Box
@@ -164,22 +165,24 @@ const AddNetwork = () => {
             marginBottom={1}
             className="add-network__main-container"
           >
-            <Typography
-              variant={TypographyVariant.H6}
+            <Text
+              variant={TextVariant.bodySm}
+              as="h6"
               color={TextColor.textAlternative}
               margin={0}
               marginTop={4}
             >
               {t('addFromAListOfPopularNetworks')}
-            </Typography>
-            <Typography
-              variant={TypographyVariant.H7}
+            </Text>
+            <Text
+              variant={TextVariant.bodySm}
+              as="h6"
               color={TextColor.textMuted}
               marginTop={4}
               marginBottom={3}
             >
               {t('popularCustomNetworks')}
-            </Typography>
+            </Text>
             {notExistingNetworkConfigurations.map((item, index) => (
               <Box
                 key={index}
@@ -200,13 +203,13 @@ const AddNetwork = () => {
                     </IconBorder>
                   </Box>
                   <Box marginLeft={2}>
-                    <Typography
-                      variant={TypographyVariant.H7}
+                    <Text
+                      variant={TextVariant.bodySmBold}
+                      as="h6"
                       color={TextColor.textDefault}
-                      fontWeight={FONT_WEIGHT.BOLD}
                     >
                       {item.nickname}
-                    </Typography>
+                    </Text>
                   </Box>
                 </Box>
                 <Box
@@ -294,12 +297,13 @@ const AddNetwork = () => {
                   : history.push(ADD_NETWORK_ROUTE);
               }}
             >
-              <Typography
-                variant={TypographyVariant.H6}
+              <Text
+                variant={TextVariant.bodySm}
+                as="h6"
                 color={TextColor.primaryDefault}
               >
                 {t('addANetworkManually')}
-              </Typography>
+              </Text>
             </Button>
           </Box>
         </Box>
diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js
index 1943c964b..aa12f0cf5 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container.component.js
@@ -20,8 +20,11 @@ import EditGasFeePopover from '../edit-gas-fee-popover/edit-gas-fee-popover';
 import EditGasPopover from '../edit-gas-popover';
 import ErrorMessage from '../../ui/error-message';
 import { INSUFFICIENT_FUNDS_ERROR_KEY } from '../../../helpers/constants/error-keys';
-import Typography from '../../ui/typography';
-import { TypographyVariant } from '../../../helpers/constants/design-system';
+import { Text } from '../../component-library';
+import {
+  TextVariant,
+  TEXT_ALIGN,
+} from '../../../helpers/constants/design-system';
 
 import NetworkAccountBalanceHeader from '../network-account-balance-header/network-account-balance-header';
 import { fetchTokenBalance } from '../../../../shared/lib/token-util.ts';
@@ -233,7 +236,11 @@ const ConfirmPageContainer = (props) => {
             <ActionableMessage
               message={
                 isBuyableChain ? (
-                  <Typography variant={TypographyVariant.H7} align="left">
+                  <Text
+                    variant={TextVariant.bodySm}
+                    textAlign={TEXT_ALIGN.LEFT}
+                    as="h6"
+                  >
                     {t('insufficientCurrencyBuyOrDeposit', [
                       nativeCurrency,
                       networkName,
@@ -256,14 +263,18 @@ const ConfirmPageContainer = (props) => {
                         {t('buyAsset', [nativeCurrency])}
                       </Button>,
                     ])}
-                  </Typography>
+                  </Text>
                 ) : (
-                  <Typography variant={TypographyVariant.H7} align="left">
+                  <Text
+                    variant={TextVariant.bodySm}
+                    textAlign={TEXT_ALIGN.LEFT}
+                    as="h6"
+                  >
                     {t('insufficientCurrencyDeposit', [
                       nativeCurrency,
                       networkName,
                     ])}
-                  </Typography>
+                  </Text>
                 )
               }
               useIcon

From 8f65c268b43b602af84485b225269c5861f9211d Mon Sep 17 00:00:00 2001
From: Thomas Huang <tmashuang@users.noreply.github.com>
Date: Wed, 29 Mar 2023 14:00:34 +0800
Subject: [PATCH 080/129] Welcome onboarding unit test (#18248)

---
 .../onboarding-flow/welcome/welcome.test.js   | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 ui/pages/onboarding-flow/welcome/welcome.test.js

diff --git a/ui/pages/onboarding-flow/welcome/welcome.test.js b/ui/pages/onboarding-flow/welcome/welcome.test.js
new file mode 100644
index 000000000..8cd699012
--- /dev/null
+++ b/ui/pages/onboarding-flow/welcome/welcome.test.js
@@ -0,0 +1,101 @@
+import React from 'react';
+import { fireEvent, screen } from '@testing-library/react';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import initializedMockState from '../../../../test/data/mock-state.json';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import { setFirstTimeFlowType } from '../../../store/actions';
+import {
+  ONBOARDING_METAMETRICS,
+  ONBOARDING_SECURE_YOUR_WALLET_ROUTE,
+  ONBOARDING_COMPLETION_ROUTE,
+} from '../../../helpers/constants/routes';
+import OnboardingWelcome from './welcome';
+
+const mockHistoryReplace = jest.fn();
+const mockHistoryPush = jest.fn();
+
+jest.mock('../../../store/actions.ts', () => ({
+  setFirstTimeFlowType: jest.fn().mockReturnValue(
+    jest.fn((type) => {
+      return type;
+    }),
+  ),
+}));
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    push: mockHistoryPush,
+    replace: mockHistoryReplace,
+  }),
+}));
+
+describe('Onboarding Welcome Component', () => {
+  const mockState = {
+    metamask: {
+      identities: {},
+      selectedAddress: '',
+    },
+  };
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('Initialized State Conditionals with keyrings and firstTimeFlowType', () => {
+    it('should route to secure your wallet when keyring is present but not imported first time flow type', () => {
+      const mockStore = configureMockStore([thunk])(initializedMockState);
+
+      renderWithProvider(<OnboardingWelcome />, mockStore);
+      expect(mockHistoryReplace).toHaveBeenCalledWith(
+        ONBOARDING_SECURE_YOUR_WALLET_ROUTE,
+      );
+    });
+
+    it('should route to completion when keyring is present and imported first time flow type', () => {
+      const importFirstTimeFlowState = {
+        ...initializedMockState,
+        metamask: {
+          ...initializedMockState.metamask,
+          firstTimeFlowType: 'import',
+        },
+      };
+      const mockStore = configureMockStore([thunk])(importFirstTimeFlowState);
+
+      renderWithProvider(<OnboardingWelcome />, mockStore);
+      expect(mockHistoryReplace).toHaveBeenCalledWith(
+        ONBOARDING_COMPLETION_ROUTE,
+      );
+    });
+  });
+
+  describe('Welcome Component', () => {
+    const mockStore = configureMockStore([thunk])(mockState);
+
+    it('should render', () => {
+      renderWithProvider(<OnboardingWelcome />, mockStore);
+      const onboardingWelcome = screen.queryByTestId('onboarding-welcome');
+      expect(onboardingWelcome).toBeInTheDocument();
+    });
+
+    it('should set first time flow to create and route to metametrics', () => {
+      renderWithProvider(<OnboardingWelcome />, mockStore);
+
+      const createWallet = screen.getByTestId('onboarding-create-wallet');
+      fireEvent.click(createWallet);
+
+      expect(setFirstTimeFlowType).toHaveBeenCalledWith('create');
+    });
+
+    it('should set first time flow to import and route to metametrics', () => {
+      renderWithProvider(<OnboardingWelcome />, mockStore);
+
+      const createWallet = screen.getByTestId('onboarding-import-wallet');
+      fireEvent.click(createWallet);
+
+      expect(setFirstTimeFlowType).toHaveBeenCalledWith('import');
+      expect(mockHistoryPush).toHaveBeenCalledWith(ONBOARDING_METAMETRICS);
+    });
+  });
+});

From 12bd9b0b94acd6a4be8516915c62b5b099fa90bf Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Wed, 29 Mar 2023 12:19:50 +0100
Subject: [PATCH 081/129] Fix missing transaction notifications (#18323)

---
 app/scripts/metamask-controller.js | 17 ++++++++++++-----
 app/scripts/platforms/extension.js | 19 ++++++++++---------
 development/build/index.js         |  1 +
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b4c2ef4ba..2d210f2a1 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -826,10 +826,12 @@ export default class MetamaskController extends EventEmitter {
 
           const originMetadata = subjectMetadataState.subjectMetadata[origin];
 
-          this.platform._showNotification(
-            originMetadata?.name ?? origin,
-            message,
-          );
+          this.platform
+            ._showNotification(originMetadata?.name ?? origin, message)
+            .catch((error) => {
+              log.error('Failed to create notification', error);
+            });
+
           return null;
         },
         showInAppNotification: (origin, message) => {
@@ -969,7 +971,12 @@ export default class MetamaskController extends EventEmitter {
           );
           rpcPrefs = matchingNetworkConfig?.rpcPrefs ?? {};
         }
-        this.platform.showTransactionNotification(txMeta, rpcPrefs);
+
+        try {
+          await this.platform.showTransactionNotification(txMeta, rpcPrefs);
+        } catch (error) {
+          log.error('Failed to create transaction notification', error);
+        }
 
         const { txReceipt } = txMeta;
 
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index 3a298e699..098c69efd 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -113,19 +113,19 @@ export default class ExtensionPlatform {
     }
   }
 
-  showTransactionNotification(txMeta, rpcPrefs) {
+  async showTransactionNotification(txMeta, rpcPrefs) {
     const { status, txReceipt: { status: receiptStatus } = {} } = txMeta;
 
     if (status === TransactionStatus.confirmed) {
       // There was an on-chain failure
       receiptStatus === '0x0'
-        ? this._showFailedTransaction(
+        ? await this._showFailedTransaction(
             txMeta,
             'Transaction encountered an error.',
           )
-        : this._showConfirmedTransaction(txMeta, rpcPrefs);
+        : await this._showConfirmedTransaction(txMeta, rpcPrefs);
     } else if (status === TransactionStatus.failed) {
-      this._showFailedTransaction(txMeta);
+      await this._showFailedTransaction(txMeta);
     }
   }
 
@@ -157,7 +157,7 @@ export default class ExtensionPlatform {
     await browser.tabs.remove(tabId);
   }
 
-  _showConfirmedTransaction(txMeta, rpcPrefs) {
+  async _showConfirmedTransaction(txMeta, rpcPrefs) {
     this._subscribeToNotificationClicked();
 
     const url = getBlockExplorerLink(txMeta, rpcPrefs);
@@ -170,10 +170,10 @@ export default class ExtensionPlatform {
     const message = `Transaction ${nonce} confirmed! ${
       url.length ? `View on ${view}` : ''
     }`;
-    this._showNotification(title, message, url);
+    await this._showNotification(title, message, url);
   }
 
-  _showFailedTransaction(txMeta, errorMessage) {
+  async _showFailedTransaction(txMeta, errorMessage) {
     const nonce = parseInt(txMeta.txParams.nonce, 16);
     const title = 'Failed transaction';
     let message = `Transaction ${nonce} failed! ${
@@ -184,12 +184,13 @@ export default class ExtensionPlatform {
       message = `Transaction failed! ${errorMessage || txMeta.err.message}`;
     }
     ///: END:ONLY_INCLUDE_IN
-    this._showNotification(title, message);
+    await this._showNotification(title, message);
   }
 
   async _showNotification(title, message, url) {
     const iconUrl = await browser.runtime.getURL('../../images/icon-64.png');
-    browser.notifications.create(url, {
+
+    await browser.notifications.create(url, {
       type: 'basic',
       title,
       iconUrl,
diff --git a/development/build/index.js b/development/build/index.js
index 456128c1f..9c9f75f16 100755
--- a/development/build/index.js
+++ b/development/build/index.js
@@ -102,6 +102,7 @@ async function defineAndRunBuildTasks() {
       'navigator',
       'harden',
       'console',
+      'Image', // Used by browser to generate notifications
       // globals chrome driver needs to function (test env)
       /cdc_[a-zA-Z0-9]+_[a-zA-Z]+/iu,
       'performance',

From 8fbd1e30e88abcbcc1c0634b44b2a28c0877ca99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Wed, 29 Mar 2023 14:49:45 +0100
Subject: [PATCH 082/129] [MMI] compliance feature page (#18320)

* MMI-2657 adds the compliance settings screen

* MMI-2657 adds stories file

* wip compliance feature page

* adds stories and fixes imports

* adds storybook and tests

* lint fix
---
 app/_locales/en/messages.json                 |  36 ++++++
 .../compliance-settings.test.js.snap          |  98 ++++++++++++++++
 .../compliance-settings.js                    |  98 ++++++++++++++++
 .../compliance-settings.stories.js            |  35 ++++++
 .../compliance-settings.test.js               |  67 +++++++++++
 .../compliance-settings/index.js              |   1 +
 .../compliance-settings/index.scss            |  27 +++++
 .../compliance-feature-page.js                |  95 ++++++++++++++++
 .../compliance-feature-page.stories.js        |  35 ++++++
 .../compliance-feature-page.test.js           | 107 ++++++++++++++++++
 .../compliance-feature-page/index.js          |   1 +
 .../compliance-feature-page/index.scss        |  29 +++++
 12 files changed, 629 insertions(+)
 create mode 100644 ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap
 create mode 100644 ui/components/institutional/compliance-settings/compliance-settings.js
 create mode 100644 ui/components/institutional/compliance-settings/compliance-settings.stories.js
 create mode 100644 ui/components/institutional/compliance-settings/compliance-settings.test.js
 create mode 100644 ui/components/institutional/compliance-settings/index.js
 create mode 100644 ui/components/institutional/compliance-settings/index.scss
 create mode 100644 ui/pages/institutional/compliance-feature-page/compliance-feature-page.js
 create mode 100644 ui/pages/institutional/compliance-feature-page/compliance-feature-page.stories.js
 create mode 100644 ui/pages/institutional/compliance-feature-page/compliance-feature-page.test.js
 create mode 100644 ui/pages/institutional/compliance-feature-page/index.js
 create mode 100644 ui/pages/institutional/compliance-feature-page/index.scss

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index cf2ebbab5..b194112a5 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -150,6 +150,9 @@
   "accountSelectionRequired": {
     "message": "You need to select an account!"
   },
+  "activated": {
+    "message": "Active"
+  },
   "active": {
     "message": "Active"
   },
@@ -639,9 +642,39 @@
   "close": {
     "message": "Close"
   },
+  "codefiCompliance": {
+    "message": "Codefi Compliance"
+  },
   "coingecko": {
     "message": "CoinGecko"
   },
+  "complianceBlurb0": {
+    "message": "DeFi raises AML/CFT risk for institutions, given the decentralised pools and pseudonymous counterparties."
+  },
+  "complianceBlurb1": {
+    "message": "Codefi Compliance is the only product capable of running AML/CFT analysis on DeFi pools. This allows you to identify and avoid pools and counterparties that fail your risk setting."
+  },
+  "complianceBlurbStep1": {
+    "message": "Sign up to Codefi Compliance below"
+  },
+  "complianceBlurbStep2": {
+    "message": "Create an organisation"
+  },
+  "complianceBlurbStep3": {
+    "message": "Create a project"
+  },
+  "complianceBlurbStep4": {
+    "message": "Set your compliance settings"
+  },
+  "complianceBlurbStep5": {
+    "message": "Click the \"Enable Compliance in MMI\" button"
+  },
+  "complianceBlurpStep0": {
+    "message": "Steps to enable AML/CFT Compliance:"
+  },
+  "complianceSettingsExplanation": {
+    "message": "Change your settings or view reports by opening up Codefi Compliance or disconnect below."
+  },
   "confirm": {
     "message": "Confirm"
   },
@@ -2676,6 +2709,9 @@
   "onlyConnectTrust": {
     "message": "Only connect with sites you trust."
   },
+  "openCodefiCompliance": {
+    "message": "Open Codefi Compliance"
+  },
   "openFullScreenForLedgerWebHid": {
     "message": "Open MetaMask in full screen to connect your ledger via WebHID.",
     "description": "Shown to the user on the confirm screen when they are viewing MetaMask in a popup window but need to connect their ledger via webhid."
diff --git a/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap b/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap
new file mode 100644
index 000000000..bddb1ef05
--- /dev/null
+++ b/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap
@@ -0,0 +1,98 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Compliance Settings shows disconnect when Compliance is activated 1`] = `
+<div>
+  <div
+    class="box box--flex-direction-row"
+  >
+    <div
+      class="box institutional-feature__content box--flex-direction-row"
+    >
+      Change your settings or view reports by opening up Codefi Compliance or disconnect below.
+    </div>
+    <footer
+      class="institutional-feature__footer"
+    >
+      <button
+        class="button btn--rounded btn-default btn--large"
+        data-testid="disconnect-compliance"
+        role="button"
+        tabindex="0"
+      >
+        Disconnect
+      </button>
+      <button
+        class="button btn--rounded btn-primary"
+        data-testid="start-compliance"
+        role="button"
+        tabindex="0"
+      >
+        Open Codefi Compliance
+      </button>
+    </footer>
+  </div>
+</div>
+`;
+
+exports[`Compliance Settings shows start btn when Compliance its not activated 1`] = `
+<div>
+  <div
+    class="box box--sm:padding-6 box--flex-direction-row box--color-text-alternative"
+    data-testid="institutional-content"
+  >
+    <div
+      class="box institutional-feature__content box--flex-direction-row"
+    >
+      <p
+        class="box mm-text mm-text--body-md mm-text--color-text-default box--padding-bottom-3 box--flex-direction-row"
+      >
+        DeFi raises AML/CFT risk for institutions, given the decentralised pools and pseudonymous counterparties.
+      </p>
+      <p
+        class="box mm-text mm-text--body-md mm-text--color-text-default box--padding-bottom-3 box--flex-direction-row"
+      >
+        Codefi Compliance is the only product capable of running AML/CFT analysis on DeFi pools. This allows you to identify and avoid pools and counterparties that fail your risk setting.
+      </p>
+      <p
+        class="box mm-text mm-text--body-md mm-text--color-text-default box--padding-bottom-3 box--flex-direction-row"
+      >
+        Steps to enable AML/CFT Compliance:
+      </p>
+      <ol>
+        <li>
+          Sign up to Codefi Compliance below
+        </li>
+        <li>
+          Create an organisation
+        </li>
+        <li>
+          Create a project
+        </li>
+        <li>
+          Set your compliance settings
+        </li>
+        <li>
+          Click the "Enable Compliance in MMI" button
+        </li>
+      </ol>
+    </div>
+    <div
+      class="box box--display-flex box--flex-direction-row box--justify-content-center"
+    >
+      <footer
+        class="institutional-feature__footer"
+        padding="4,6"
+      >
+        <button
+          class="button btn--rounded btn-primary"
+          data-testid="start-compliance"
+          role="button"
+          tabindex="0"
+        >
+          Open Codefi Compliance
+        </button>
+      </footer>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/institutional/compliance-settings/compliance-settings.js b/ui/components/institutional/compliance-settings/compliance-settings.js
new file mode 100644
index 000000000..aca08e198
--- /dev/null
+++ b/ui/components/institutional/compliance-settings/compliance-settings.js
@@ -0,0 +1,98 @@
+import React, { useContext } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  JustifyContent,
+  DISPLAY,
+  TextColor,
+  FLEX_DIRECTION,
+} from '../../../helpers/constants/design-system';
+import { I18nContext } from '../../../contexts/i18n';
+import { mmiActionsFactory } from '../../../store/institutional/institution-background';
+import { Text } from '../../component-library';
+import Box from '../../ui/box';
+import Button from '../../ui/button';
+
+const ComplianceSettings = () => {
+  const t = useContext(I18nContext);
+  const dispatch = useDispatch();
+  const mmiActions = mmiActionsFactory();
+
+  const complianceActivated = useSelector((state) =>
+    Boolean(state.metamask.institutionalFeatures?.complianceProjectId),
+  );
+
+  const disconnectFromCompliance = async () => {
+    await dispatch(mmiActions.deleteComplianceAuthData());
+  };
+
+  const renderDisconnect = () => {
+    return (
+      <Button
+        type="default"
+        large
+        onClick={disconnectFromCompliance}
+        data-testid="disconnect-compliance"
+      >
+        {t('disconnect')}
+      </Button>
+    );
+  };
+
+  const renderLinkButton = () => {
+    return (
+      <Button
+        type="primary"
+        data-testid="start-compliance"
+        onClick={() => {
+          global.platform.openTab({
+            url: 'https://start.compliance.codefi.network/',
+          });
+        }}
+      >
+        {t('openCodefiCompliance')}
+      </Button>
+    );
+  };
+
+  return complianceActivated ? (
+    <Box>
+      <Box className="institutional-feature__content">
+        {t('complianceSettingsExplanation')}
+      </Box>
+      <footer className="institutional-feature__footer">
+        {renderDisconnect()}
+        {renderLinkButton()}
+      </footer>
+    </Box>
+  ) : (
+    <Box
+      padding={[0, 6]}
+      color={TextColor.textAlternative}
+      data-testid="institutional-content"
+    >
+      <Box className="institutional-feature__content">
+        <Text paddingBottom={3}>{t('complianceBlurb0')}</Text>
+        <Text paddingBottom={3}>{t('complianceBlurb1')}</Text>
+        <Text paddingBottom={3}>{t('complianceBlurpStep0')}</Text>
+        <ol>
+          <li>{t('complianceBlurbStep1')}</li>
+          <li>{t('complianceBlurbStep2')}</li>
+          <li>{t('complianceBlurbStep3')}</li>
+          <li>{t('complianceBlurbStep4')}</li>
+          <li>{t('complianceBlurbStep5')}</li>
+        </ol>
+      </Box>
+      <Box
+        display={DISPLAY.FLEX}
+        flexDirection={FLEX_DIRECTION.ROW}
+        justifyContent={JustifyContent.center}
+      >
+        <footer padding={[4, 6]} className="institutional-feature__footer">
+          {renderLinkButton()}
+        </footer>
+      </Box>
+    </Box>
+  );
+};
+
+export default ComplianceSettings;
diff --git a/ui/components/institutional/compliance-settings/compliance-settings.stories.js b/ui/components/institutional/compliance-settings/compliance-settings.stories.js
new file mode 100644
index 000000000..c3f73a8a3
--- /dev/null
+++ b/ui/components/institutional/compliance-settings/compliance-settings.stories.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { action } from '@storybook/addon-actions';
+import configureStore from '../../../store/store';
+import testData from '../../../../.storybook/test-data';
+import ComplianceSettings from '.';
+
+const customData = {
+  ...testData,
+  metamask: {
+    ...testData.metamask,
+    institutionalFeatures: {
+      complianceProjectId: '',
+      complianceClientId: '',
+      reportsInProgress: {},
+    },
+  },
+};
+
+const store = configureStore(customData);
+
+export default {
+  title: 'Components/Institutional/ComplianceSettings',
+  decorators: [(story) => <Provider store={store}>{story()}</Provider>],
+  component: ComplianceSettings,
+  args: {
+    onClick: () => {
+      action('onClick');
+    },
+  },
+};
+
+export const DefaultStory = (args) => <ComplianceSettings {...args} />;
+
+DefaultStory.storyName = 'ComplianceSettings';
diff --git a/ui/components/institutional/compliance-settings/compliance-settings.test.js b/ui/components/institutional/compliance-settings/compliance-settings.test.js
new file mode 100644
index 000000000..b6d3e95b1
--- /dev/null
+++ b/ui/components/institutional/compliance-settings/compliance-settings.test.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import ComplianceSettings from '.';
+
+const mockedDeleteComplianceAuthData = jest
+  .fn()
+  .mockReturnValue({ type: 'TYPE' });
+jest.mock('../../../store/institutional/institution-background', () => ({
+  mmiActionsFactory: () => ({
+    deleteComplianceAuthData: mockedDeleteComplianceAuthData,
+  }),
+}));
+
+const mockStore = {
+  metamask: {
+    provider: {
+      type: 'test',
+    },
+    institutionalFeatures: {
+      complianceProjectId: '',
+      complianceClientId: '',
+      reportsInProgress: {},
+    },
+    preferences: {
+      useNativeCurrencyAsPrimaryCurrency: true,
+    },
+  },
+};
+
+describe('Compliance Settings', () => {
+  it('shows start btn when Compliance its not activated', () => {
+    const store = configureMockStore()(mockStore);
+
+    const { container, getByTestId } = renderWithProvider(
+      <ComplianceSettings />,
+      store,
+    );
+
+    expect(getByTestId('start-compliance')).toBeVisible();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('shows disconnect when Compliance is activated', () => {
+    const customMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        institutionalFeatures: {
+          complianceProjectId: '123',
+          complianceClientId: '123',
+          reportsInProgress: {},
+        },
+      },
+    };
+
+    const store = configureMockStore()(customMockStore);
+
+    const { container, getByTestId } = renderWithProvider(
+      <ComplianceSettings />,
+      store,
+    );
+
+    expect(getByTestId('disconnect-compliance')).toBeVisible();
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/components/institutional/compliance-settings/index.js b/ui/components/institutional/compliance-settings/index.js
new file mode 100644
index 000000000..5105b8bea
--- /dev/null
+++ b/ui/components/institutional/compliance-settings/index.js
@@ -0,0 +1 @@
+export { default } from './compliance-settings';
diff --git a/ui/components/institutional/compliance-settings/index.scss b/ui/components/institutional/compliance-settings/index.scss
new file mode 100644
index 000000000..df59c0c06
--- /dev/null
+++ b/ui/components/institutional/compliance-settings/index.scss
@@ -0,0 +1,27 @@
+.institutional-feature {
+  &__footer {
+    border-top: 1px solid var(--color-text-muted);
+    padding: 16px 30px;
+    flex: 0 0 auto;
+
+    button {
+      min-width: 0;
+      margin-right: 16px;
+
+      &:last-of-type {
+        margin-right: 0;
+      }
+    }
+  }
+
+  &__content {
+    @include H6;
+
+    line-height: 22px;
+
+    ol {
+      list-style: decimal;
+      list-style-position: inside;
+    }
+  }
+}
diff --git a/ui/pages/institutional/compliance-feature-page/compliance-feature-page.js b/ui/pages/institutional/compliance-feature-page/compliance-feature-page.js
new file mode 100644
index 000000000..0b050ad4c
--- /dev/null
+++ b/ui/pages/institutional/compliance-feature-page/compliance-feature-page.js
@@ -0,0 +1,95 @@
+import React, { useContext } from 'react';
+import { useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import { I18nContext } from '../../../contexts/i18n';
+import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
+import {
+  JustifyContent,
+  DISPLAY,
+  AlignItems,
+  TextColor,
+  TEXT_ALIGN,
+  BackgroundColor,
+  Color,
+  FLEX_DIRECTION,
+} from '../../../helpers/constants/design-system';
+import {
+  ButtonIcon,
+  ICON_NAMES,
+  ICON_SIZES,
+  Text,
+} from '../../../components/component-library';
+import Box from '../../../components/ui/box';
+import ComplianceSettings from '../../../components/institutional/compliance-settings';
+
+const ComplianceFeaturePage = () => {
+  const t = useContext(I18nContext);
+  const history = useHistory();
+
+  const complianceActivated = useSelector((state) =>
+    Boolean(state.metamask.institutionalFeatures?.complianceProjectId),
+  );
+
+  return (
+    <Box
+      className="institutional-entity"
+      backgroundColor={BackgroundColor.backgroundDefault}
+    >
+      <>
+        <Box
+          display={DISPLAY.FLEX}
+          flexDirection={FLEX_DIRECTION.COLUMN}
+          padding={[0, 6, 6]}
+          className="feature-connect__header"
+        >
+          <ButtonIcon
+            ariaLabel={t('back')}
+            iconName={ICON_NAMES.ARROW_LEFT}
+            size={ICON_SIZES.SM}
+            className="settings-page__back-button"
+            color={Color.iconDefault}
+            onClick={() => history.push(DEFAULT_ROUTE)}
+            display={[DISPLAY.FLEX]}
+          />
+          <Text
+            as="h4"
+            marginTop={4}
+            marginBottom={4}
+            className="feature-connect__header__title"
+          >
+            <Box
+              display={DISPLAY.FLEX}
+              alignItems={AlignItems.center}
+              color={TextColor.textDefault}
+            >
+              <img
+                className="feature-connect__list__list-item__img"
+                src="images/compliance-logo-small.svg"
+                alt="Codefi Compliance"
+              />
+              {t('codefiCompliance')}
+              {complianceActivated && (
+                <Text
+                  as="h6"
+                  margin={[2, 2, 0, 2]}
+                  color={TextColor.textMuted}
+                  display={DISPLAY.FLEX}
+                  textAlign={TEXT_ALIGN.LEFT}
+                  flexDirection={FLEX_DIRECTION.COLUMN}
+                  justifyContent={JustifyContent.center}
+                  className="feature-connect__label__text feature-connect__label__text--activated"
+                  data-testid="activated-label"
+                >
+                  {t('activated')}
+                </Text>
+              )}
+            </Box>
+          </Text>
+        </Box>
+        <ComplianceSettings />
+      </>
+    </Box>
+  );
+};
+
+export default ComplianceFeaturePage;
diff --git a/ui/pages/institutional/compliance-feature-page/compliance-feature-page.stories.js b/ui/pages/institutional/compliance-feature-page/compliance-feature-page.stories.js
new file mode 100644
index 000000000..a70991369
--- /dev/null
+++ b/ui/pages/institutional/compliance-feature-page/compliance-feature-page.stories.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { action } from '@storybook/addon-actions';
+import configureStore from '../../../store/store';
+import testData from '../../../../.storybook/test-data';
+import ComplianceFeaturePage from '.';
+
+const customData = {
+  ...testData,
+  metamask: {
+    ...testData.metamask,
+    institutionalFeatures: {
+      complianceProjectId: '',
+      complianceClientId: '',
+      reportsInProgress: {},
+    },
+  },
+};
+
+const store = configureStore(customData);
+
+export default {
+  title: 'Pages/Institutional/ComplianceFeaturePage',
+  decorators: [(story) => <Provider store={store}>{story()}</Provider>],
+  component: ComplianceFeaturePage,
+  args: {
+    onClick: () => {
+      action('onClick');
+    },
+  },
+};
+
+export const DefaultStory = (args) => <ComplianceFeaturePage {...args} />;
+
+DefaultStory.storyName = 'ComplianceFeaturePage';
diff --git a/ui/pages/institutional/compliance-feature-page/compliance-feature-page.test.js b/ui/pages/institutional/compliance-feature-page/compliance-feature-page.test.js
new file mode 100644
index 000000000..9b75b9107
--- /dev/null
+++ b/ui/pages/institutional/compliance-feature-page/compliance-feature-page.test.js
@@ -0,0 +1,107 @@
+import React from 'react';
+import sinon from 'sinon';
+import configureMockStore from 'redux-mock-store';
+import { fireEvent, waitFor } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import ComplianceFeaturePage from '.';
+
+const mockedDeleteComplianceAuthData = jest
+  .fn()
+  .mockReturnValue({ type: 'TYPE' });
+jest.mock('../../../store/institutional/institution-background', () => ({
+  mmiActionsFactory: () => ({
+    deleteComplianceAuthData: mockedDeleteComplianceAuthData,
+  }),
+}));
+
+describe('Compliance Feature, connect', function () {
+  const mockStore = {
+    metamask: {
+      provider: {
+        type: 'test',
+      },
+      institutionalFeatures: {
+        complianceProjectId: '',
+      },
+      preferences: {
+        useNativeCurrencyAsPrimaryCurrency: true,
+      },
+    },
+  };
+
+  it('shows compliance feature button as activated', () => {
+    const customMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        institutionalFeatures: {
+          complianceProjectId: '123',
+          complianceClientId: '123',
+          reportsInProgress: {},
+        },
+      },
+    };
+
+    const store = configureMockStore()(customMockStore);
+
+    const { getByText, getByTestId } = renderWithProvider(
+      <ComplianceFeaturePage />,
+      store,
+    );
+
+    expect(getByTestId('activated-label')).toBeVisible();
+    expect(getByText('Active')).toBeInTheDocument();
+  });
+
+  it('shows ComplianceSettings when feature is not activated', () => {
+    const store = configureMockStore()(mockStore);
+
+    const { getByTestId } = renderWithProvider(
+      <ComplianceFeaturePage />,
+      store,
+    );
+
+    expect(getByTestId('institutional-content')).toBeVisible();
+  });
+
+  it('opens new tab on Open Codefi Compliance click', async () => {
+    global.platform = { openTab: sinon.spy() };
+    const store = configureMockStore()(mockStore);
+
+    const { queryByTestId } = renderWithProvider(
+      <ComplianceFeaturePage />,
+      store,
+    );
+
+    const startBtn = queryByTestId('start-compliance');
+    fireEvent.click(startBtn);
+
+    await waitFor(() => {
+      expect(global.platform.openTab.calledOnce).toStrictEqual(true);
+    });
+  });
+
+  it('calls deleteComplianceAuthData on disconnect click', async () => {
+    const customMockStore = {
+      ...mockStore,
+      metamask: {
+        ...mockStore.metamask,
+        institutionalFeatures: {
+          complianceProjectId: '123',
+          complianceClientId: '123',
+          reportsInProgress: {},
+        },
+      },
+    };
+
+    const store = configureMockStore()(customMockStore);
+    const { getByTestId } = renderWithProvider(
+      <ComplianceFeaturePage />,
+      store,
+    );
+
+    const disconnectBtn = getByTestId('disconnect-compliance');
+    fireEvent.click(disconnectBtn);
+    expect(mockedDeleteComplianceAuthData).toHaveBeenCalled();
+  });
+});
diff --git a/ui/pages/institutional/compliance-feature-page/index.js b/ui/pages/institutional/compliance-feature-page/index.js
new file mode 100644
index 000000000..e105bee40
--- /dev/null
+++ b/ui/pages/institutional/compliance-feature-page/index.js
@@ -0,0 +1 @@
+export { default } from './compliance-feature-page';
diff --git a/ui/pages/institutional/compliance-feature-page/index.scss b/ui/pages/institutional/compliance-feature-page/index.scss
new file mode 100644
index 000000000..61166d988
--- /dev/null
+++ b/ui/pages/institutional/compliance-feature-page/index.scss
@@ -0,0 +1,29 @@
+.institutional-entity {
+  box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
+}
+
+.feature-connect {
+  &__list {
+    &__list-item {
+      &__img {
+        height: 32px;
+        width: 32px;
+        margin: 0 10px 0 0;
+      }
+    }
+  }
+
+  &__label {
+    &__text {
+      font-size: 0.6rem;
+
+      &--activated {
+        color: var(--color-text-default);
+        background: var(--color-primary-default);
+        padding: 3px 10px;
+        border-radius: 10px;
+        margin-top: 0;
+      }
+    }
+  }
+}

From ff20873c654bf7094f4d2dee5b4b71e828df9d4f Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Wed, 29 Mar 2023 16:01:05 +0100
Subject: [PATCH 083/129] Add documentation for creating new confirmations
 (#18317)

---
 README.md                    |   1 +
 docs/assets/confirmation.png | Bin 0 -> 72222 bytes
 docs/confirmations.md        | 253 +++++++++++++++++++++++++++++++++++
 3 files changed, 254 insertions(+)
 create mode 100644 docs/assets/confirmation.png
 create mode 100644 docs/confirmations.md

diff --git a/README.md b/README.md
index 48dbe9f3f..bf2671159 100644
--- a/README.md
+++ b/README.md
@@ -142,6 +142,7 @@ Whenever you change dependencies (adding, removing, or updating, either in `pack
 - [How to use the TREZOR emulator](./docs/trezor-emulator.md)
 - [Developing on MetaMask](./development/README.md)
 - [How to generate a visualization of this repository's development](./development/gource-viz.sh)
+- [How to add new confirmations](./docs/confirmations.md)
 
 ## Dapp Developer Resources
 
diff --git a/docs/assets/confirmation.png b/docs/assets/confirmation.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4b58a2f68db387bd5328fe708d88f5bb4bee4f2
GIT binary patch
literal 72222
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%0D87{d6s9>EZp*afemO7Q
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

literal 0
HcmV?d00001

diff --git a/docs/confirmations.md b/docs/confirmations.md
new file mode 100644
index 000000000..2f3aef515
--- /dev/null
+++ b/docs/confirmations.md
@@ -0,0 +1,253 @@
+# Adding New Confirmations
+
+## Overview
+
+Given the security focused nature of self-custody, confirmations and approvals form a pivotal aspect of the MetaMask extension.
+
+Confirmations can be triggered by dApps and the UI itself, and are used to approve a variety of operations such as:
+
+- Connecting to dApps
+- Giving permissions to dApps
+- Sending Eth
+- Transfering tokens
+- Signing data
+- Interacting with Snaps
+- Adding Ethereum networks
+
+It is vital any new confirmations are implemented using best practices and consistent patterns, to avoid adding complexity to the code, and to minimise the maintenance cost of many alternate confirmations.
+
+As we try to maintain a clean boundary between the UI and background page, the effort to implement a new confirmation can also be split accordingly.
+
+## Background
+
+### 1. Create Messenger
+
+Ensure the controller or logic requiring a confirmation has access to a controller messenger.
+
+Provide a `messenger` argument in the constructor if using a controller.
+
+Ensure the allowed actions include at least the `ApprovalController:addRequest` action.
+
+If the controller extends `BaseControllerV2`, the property `messagingSystem` is available to access the messenger passed to the base controller. Otherwise, ensure the provided messenger is assigned to a private property.
+
+#### Example
+
+```
+this.someController = new SomeController({
+    messenger: this.controllerMessenger.getRestricted({
+      name: 'SomeController',
+      allowedActions: [
+        `${this.approvalController.name}:addRequest`,
+        `${this.approvalController.name}:acceptRequest`,
+        `${this.approvalController.name}:rejectRequest`,
+      ],
+    }),
+    ...
+});
+```
+
+### 2. Create Approval Request
+
+Send an `addRequest` message to the `ApprovalController` to create an approval request.
+
+This message returns a `Promise` which will resolve if the confirmation is approved, and reject if the confirmation is denied or cancelled.
+
+Use an `async` function to send the message so the logic can `await` the confirmation and code execution can continue once approved. This enables the logic ran after approval to be kept in the same flow and therefore the logic to remain readable and encapsulated.
+
+Ensure suitable error handling is in place to handle the confirmation being cancelled or denied and therefore the `Promise` being rejected.
+
+The available message arguments are:
+
+| Name | Description | Example Value |
+| -- | -- | -- |
+| opts.id | The ID of the approval request.<br>Assigned to a random value if not provided. | `"f81f5c8a-33bb-4f31-a4e2-52f8b94c393b"` |
+| opts.origin | The origin of the request.<br>Either the dApp host or "metamask" if internal. | `"metamask.github.io"` |
+| opts.type | An arbitrary string identifying the type of request. | `"eth_signTypedData"` |
+| opts.requestData | Additional fixed data for the request.<br>Must be a JSON compatible object.| `{ transactionId: '123' }` |
+| opts.requestState | Additional mutable data for the request.<br>Must be a JSON compatible object.<br>Can be updated using the `ApprovalController.updateRequestState` action. | `{ status: 'pending' }` |
+| shouldShowRequest | A boolean indicating whether the popup should be displayed. | `true` |
+
+#### Example
+
+```
+await this.messagingSystem.call(
+  'ApprovalController:addRequest',
+  {
+    id,
+    origin,
+    type,
+    requestData,
+  },
+  true,
+);
+```
+
+### 3. Update Approval Request
+
+If you wish to provide additional state to the confirmation while it is visible, send an `updateRequestState` message to the `ApprovalController`.
+
+This requires you to have provided the `id` when creating the approval request, so it can be passed to the update message.
+
+The available message arguments are:
+
+| Name | Description | Example Value |
+| -- | -- | -- |
+| opts.id | The ID of the approval request to update. | `"f81f5c8a-33bb-4f31-a4e2-52f8b94c393b"` |
+| opts.requestState | The updated mutable data for the request.<br>Must be a JSON compatible object. | `{ status: 'pending' }` |
+
+#### Example
+
+```
+await this.messagingSystem.call(
+  'ApprovalController:updateRequestState',
+  {
+    id,
+    requestState: { counter },
+  },
+);
+```
+
+## Frontend
+
+### 1. Create Template File
+
+The `ConfirmationPage` component is already configured to display any approval requests generated by the `ApprovalController` and the associated `pendingApprovals` state.
+
+In order to configure how the resulting confirmation is rendered, an **Approval Template** is required.
+
+Create a new JavaScript file in `ui/pages/confirmation/templates` with the name matching the `type` used in the background approval request.
+
+### 2. Update Approval Templates
+
+Add your imported file to the `APPROVAL_TEMPLATES` constant in:
+[ui/pages/confirmation/templates/index.js](../ui/pages/confirmation/templates/index.js)
+
+### 3. Define Values
+
+Inside the template file, define a `getValues` function that returns an object with the following properties:
+
+| Name | Description | Example Value |
+| -- | -- | -- |
+| content | An array of objects defining the components to be rendered in the confirmation.<br>Processed by the [MetaMaskTemplateRenderer](../ui/components/app/metamask-template-renderer/metamask-template-renderer.js).  | See example below. |
+| onSubmit | A callback to execute when the user approves the confirmation. | `actions.resolvePendingApproval(...)` |
+| onCancel | A callback to execute when the user rejects the confirmation. | `actions.rejectPendingApproval(...)` |
+| submitText | Text shown for the accept button. | `t('approveButtonText')` |
+| cancelText | Text shown on the reject button. | `t('cancel')` |
+| loadingText | Text shown while waiting for the onSubmit callback to complete. | `t('addingCustomNetwork')` |
+| networkDisplay | A boolean indicating whether to show the current network at the top of the confirmation. | `true` |
+
+#### Example
+
+```
+function getValues(pendingApproval, t, actions, _history) {
+  return {
+    content: [
+      {
+        element: 'Typography',
+        key: 'title',
+        children: 'Example',
+        props: {
+          variant: TypographyVariant.H3,
+          align: 'center',
+          fontWeight: 'bold',
+          boxProps: {
+            margin: [0, 0, 4],
+          },
+        },
+      },
+      ...
+    ],
+    cancelText: t('cancel'),
+    submitText: t('approveButtonText'),
+    loadingText: t('addingCustomNetwork'),
+    onSubmit: () =>
+      actions.resolvePendingApproval(
+        pendingApproval.id,
+        pendingApproval.requestData,
+      ),
+    onCancel: () =>
+      actions.rejectPendingApproval(
+        pendingApproval.id,
+        ethErrors.provider.userRejectedRequest().serialize(),
+      ),
+    networkDisplay: true,
+  };
+}
+```
+
+### 4. Define Alerts
+
+If any alerts are required in the confirmation, define the `getAlerts` function in the template file.
+
+This needs to return an array of any required alerts, based on the current pending approval.
+
+Each alert is an object with the following properties:
+
+| Name | Description | Example Value |
+| -- | -- | -- |
+| id | A unique string to identify the alert.  | `"MISMATCHED_NETWORK_RPC"` |
+| severity | The severity of the alert.<br>Use the constants from the design system. | `SEVERITIES.DANGER` |
+| content | The component to be rendered inside the alert.<br>Uses the same format as the `content` returned from `getValues`.<br>The component can have nested components via the `children` property. | See example below. |
+
+#### Example
+
+```
+function getAlerts(_pendingApproval) {
+  return [
+    {
+      id: 'EXAMPLE_ALERT',
+      severity: SEVERITIES.WARNING,
+      content: {
+        element: 'span',
+        children: {
+          element: 'MetaMaskTranslation',
+          props: {
+            translationKey: 'exampleMessage',
+          },
+        },
+      },
+    },
+  ];
+}
+```
+
+### 5. Export Functions
+
+Ensure the `getValues` and `getAlerts` functions are exported from the template file.
+
+#### Example
+
+```
+const example = {
+  getAlerts,
+  getValues,
+};
+
+export default example;
+```
+
+## Example Branch
+
+See [this branch](https://github.com/MetaMask/metamask-extension/compare/develop...example/confirmation) as an example of the full code needed to add a confirmation.
+
+The confirmation can be tested using the [E2E Test dApp](https://metamask.github.io/test-dapp/) and selecting `Request Permissions`.
+
+## Glossary
+
+### ApprovalController
+
+The [ApprovalController](https://github.com/MetaMask/core/blob/main/packages/approval-controller/src/ApprovalController.ts) is a controller defined in the core repository which is responsible for creating and tracking approvals and confirmations in both the MetaMask extension and MetaMask mobile.
+
+The `pendingApprovals` state used by the `ApprovalController` is not currently persisted, meaning any confirmations created by it will not persist after restarting the browser for example.
+
+### ConfirmationPage
+
+The [ConfirmationPage](../ui/pages/confirmation/confirmation.js) is a React component that aims to provide a generic confirmation window which can be configured using templates, each implementing a consistent interface.
+
+This avoids the need for additional React components when creating confirmations, as additional templates with less logic, and less duplication, can be created instead.
+
+## Screenshots
+
+### Confirmation Window
+
+[<img src="assets/confirmation.png" width="300">](assets/confirmation.png)

From 0fde32c1f5adca908918046c8095b718b35278ad Mon Sep 17 00:00:00 2001
From: PeterYinusa <peter.yinusa@consensys.net>
Date: Wed, 29 Mar 2023 16:32:59 +0100
Subject: [PATCH 084/129] Conflict cleanup 10.27.0 master-sync

---
 shared/constants/network.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index 433ee1dba..e2d6cf40e 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -290,12 +290,6 @@ export const BUILT_IN_NETWORKS = {
     ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_TESTNET],
     blockExplorerUrl: 'https://explorer.goerli.linea.build',
   },
-  [NETWORK_TYPES.LINEA_TESTNET]: {
-    networkId: NETWORK_IDS.LINEA_TESTNET,
-    chainId: CHAIN_IDS.LINEA_TESTNET,
-    ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_TESTNET],
-    blockExplorerUrl: 'https://explorer.goerli.linea.build',
-  },
   [NETWORK_TYPES.MAINNET]: {
     networkId: NETWORK_IDS.MAINNET,
     chainId: CHAIN_IDS.MAINNET,

From efc34b94203934d7f4ba87048fcc6d5c1f8f65a6 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 29 Mar 2023 11:14:38 -0500
Subject: [PATCH 085/129] UX: Multichain: Address Copy Button (#18153)

---
 .../address-copy-button.js                    | 64 +++++++++++++++++++
 .../address-copy-button.stories.js            | 36 +++++++++++
 .../address-copy-button.test.js               | 31 +++++++++
 .../multichain/address-copy-button/index.js   |  1 +
 .../multichain/address-copy-button/index.scss |  7 ++
 ui/components/multichain/index.js             |  1 +
 .../multichain/multichain-components.scss     |  1 +
 ui/components/ui/qr-code/qr-code.js           | 44 +++++++------
 8 files changed, 167 insertions(+), 18 deletions(-)
 create mode 100644 ui/components/multichain/address-copy-button/address-copy-button.js
 create mode 100644 ui/components/multichain/address-copy-button/address-copy-button.stories.js
 create mode 100644 ui/components/multichain/address-copy-button/address-copy-button.test.js
 create mode 100644 ui/components/multichain/address-copy-button/index.js
 create mode 100644 ui/components/multichain/address-copy-button/index.scss

diff --git a/ui/components/multichain/address-copy-button/address-copy-button.js b/ui/components/multichain/address-copy-button/address-copy-button.js
new file mode 100644
index 000000000..f88fabdd8
--- /dev/null
+++ b/ui/components/multichain/address-copy-button/address-copy-button.js
@@ -0,0 +1,64 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import { ICON_NAMES, ButtonBase } from '../../component-library';
+import {
+  BackgroundColor,
+  TextVariant,
+  TextColor,
+  Size,
+  BorderRadius,
+  AlignItems,
+} from '../../../helpers/constants/design-system';
+import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
+import { shortenAddress } from '../../../helpers/utils/util';
+import Tooltip from '../../ui/tooltip/tooltip';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+export const AddressCopyButton = ({
+  address,
+  shorten = false,
+  wrap = false,
+}) => {
+  const displayAddress = shorten ? shortenAddress(address) : address;
+  const [copied, handleCopy] = useCopyToClipboard();
+  const t = useI18nContext();
+
+  return (
+    <Tooltip position="bottom" title={copied ? t('copiedExclamation') : null}>
+      <ButtonBase
+        backgroundColor={BackgroundColor.primaryMuted}
+        onClick={() => handleCopy(address)}
+        paddingRight={4}
+        paddingLeft={4}
+        size={Size.SM}
+        variant={TextVariant.bodyXs}
+        color={TextColor.primaryDefault}
+        endIconName={copied ? ICON_NAMES.COPY_SUCCESS : ICON_NAMES.COPY}
+        className={classnames('multichain-address-copy-button', {
+          'multichain-address-copy-button__address--wrap': wrap,
+        })}
+        borderRadius={BorderRadius.pill}
+        alignItems={AlignItems.center}
+        data-testid="address-copy-button-text"
+      >
+        {displayAddress}
+      </ButtonBase>
+    </Tooltip>
+  );
+};
+
+AddressCopyButton.propTypes = {
+  /**
+   * Address to be copied
+   */
+  address: PropTypes.string.isRequired,
+  /**
+   * Represents if the address should be shortened
+   */
+  shorten: PropTypes.bool,
+  /**
+   * Represents if the element should wrap to multiple lines
+   */
+  wrap: PropTypes.bool,
+};
diff --git a/ui/components/multichain/address-copy-button/address-copy-button.stories.js b/ui/components/multichain/address-copy-button/address-copy-button.stories.js
new file mode 100644
index 000000000..869bfec25
--- /dev/null
+++ b/ui/components/multichain/address-copy-button/address-copy-button.stories.js
@@ -0,0 +1,36 @@
+import React from 'react';
+import { AddressCopyButton } from '.';
+
+export default {
+  title: 'Components/Multichain/AddressCopyButton',
+  component: AddressCopyButton,
+  argTypes: {
+    address: {
+      control: 'text',
+    },
+    shorten: {
+      control: 'boolean',
+    },
+    wrap: {
+      control: 'boolean',
+    },
+  },
+  args: {
+    address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+  },
+};
+
+export const DefaultStory = (args) => <AddressCopyButton {...args} />;
+DefaultStory.storyName = 'Default';
+
+export const ShortenedStory = (args) => <AddressCopyButton {...args} />;
+ShortenedStory.storyName = 'Shortened';
+ShortenedStory.args = { shorten: true };
+
+export const WrappedStory = (args) => (
+  <div style={{ width: '200px' }}>
+    <AddressCopyButton {...args} />
+  </div>
+);
+WrappedStory.storyName = 'Wrapped';
+WrappedStory.args = { wrap: true };
diff --git a/ui/components/multichain/address-copy-button/address-copy-button.test.js b/ui/components/multichain/address-copy-button/address-copy-button.test.js
new file mode 100644
index 000000000..a885fe45d
--- /dev/null
+++ b/ui/components/multichain/address-copy-button/address-copy-button.test.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import { fireEvent, render } from '@testing-library/react';
+import { AddressCopyButton } from '.';
+
+const SAMPLE_ADDRESS = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
+
+describe('AccountListItem', () => {
+  it('renders the full address by default', () => {
+    render(<AddressCopyButton address={SAMPLE_ADDRESS} />);
+    expect(
+      document.querySelector('[data-testid="address-copy-button-text"]')
+        .textContent,
+    ).toStrictEqual(SAMPLE_ADDRESS);
+  });
+
+  it('renders a shortened address when it should', () => {
+    render(<AddressCopyButton address={SAMPLE_ADDRESS} shorten />);
+    expect(
+      document.querySelector('[data-testid="address-copy-button-text"]')
+        .textContent,
+    ).toStrictEqual('0x0dc...e7bc');
+  });
+
+  it('changes icon when clicked', () => {
+    render(<AddressCopyButton address={SAMPLE_ADDRESS} />);
+    fireEvent.click(document.querySelector('button'));
+    expect(document.querySelector('.mm-icon').style.maskImage).toContain(
+      'copy-success.svg',
+    );
+  });
+});
diff --git a/ui/components/multichain/address-copy-button/index.js b/ui/components/multichain/address-copy-button/index.js
new file mode 100644
index 000000000..8b93ba9b9
--- /dev/null
+++ b/ui/components/multichain/address-copy-button/index.js
@@ -0,0 +1 @@
+export { AddressCopyButton } from './address-copy-button';
diff --git a/ui/components/multichain/address-copy-button/index.scss b/ui/components/multichain/address-copy-button/index.scss
new file mode 100644
index 000000000..12226fec1
--- /dev/null
+++ b/ui/components/multichain/address-copy-button/index.scss
@@ -0,0 +1,7 @@
+.multichain-address-copy-button {
+  &__address--wrap {
+    word-break: break-word;
+    min-height: 32px;
+    height: auto;
+  }
+}
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
index 29562dc83..edf6785b9 100644
--- a/ui/components/multichain/index.js
+++ b/ui/components/multichain/index.js
@@ -5,3 +5,4 @@ export { DetectedTokensBanner } from './detected-token-banner';
 export { GlobalMenu } from './global-menu';
 export { MultichainImportTokenLink } from './multichain-import-token-link';
 export { MultichainTokenListItem } from './multichain-token-list-item';
+export { AddressCopyButton } from './address-copy-button';
diff --git a/ui/components/multichain/multichain-components.scss b/ui/components/multichain/multichain-components.scss
index e8ee40ffa..8fe555f0b 100644
--- a/ui/components/multichain/multichain-components.scss
+++ b/ui/components/multichain/multichain-components.scss
@@ -4,6 +4,7 @@
 * This will help improve specificity and reduce the chance of
 * unintended overrides.
 **/
+@import 'address-copy-button/index';
 @import 'account-list-item/index';
 @import 'account-list-menu/index';
 @import 'multichain-token-list-item/multichain-token-list-item';
diff --git a/ui/components/ui/qr-code/qr-code.js b/ui/components/ui/qr-code/qr-code.js
index 758620092..995424c5f 100644
--- a/ui/components/ui/qr-code/qr-code.js
+++ b/ui/components/ui/qr-code/qr-code.js
@@ -8,6 +8,8 @@ import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils
 import Tooltip from '../tooltip';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { Icon, ICON_NAMES, ICON_SIZES } from '../../component-library';
+import { AddressCopyButton } from '../../multichain/address-copy-button';
+import Box from '../box/box';
 
 export default connect(mapStateToProps)(QrCodeView);
 
@@ -56,25 +58,31 @@ function QrCodeView(props) {
           __html: qrImage.createTableTag(4),
         }}
       />
-      <Tooltip
-        wrapperClassName="qr-code__address-container__tooltip-wrapper"
-        position="bottom"
-        title={copied ? t('copiedExclamation') : t('copyToClipboard')}
-      >
-        <div
-          className="qr-code__address-container"
-          onClick={() => {
-            handleCopy(toChecksumHexAddress(data));
-          }}
+      {process.env.MULTICHAIN ? (
+        <Box marginLeft={2} marginRight={2}>
+          <AddressCopyButton wrap address={toChecksumHexAddress(data)} />
+        </Box>
+      ) : (
+        <Tooltip
+          wrapperClassName="qr-code__address-container__tooltip-wrapper"
+          position="bottom"
+          title={copied ? t('copiedExclamation') : t('copyToClipboard')}
         >
-          <div className="qr-code__address">{toChecksumHexAddress(data)}</div>
-          <Icon
-            name={copied ? ICON_NAMES.COPY_SUCCESS : ICON_NAMES.COPY}
-            size={ICON_SIZES.SM}
-            marginInlineStart={3}
-          />
-        </div>
-      </Tooltip>
+          <div
+            className="qr-code__address-container"
+            onClick={() => {
+              handleCopy(toChecksumHexAddress(data));
+            }}
+          >
+            <div className="qr-code__address">{toChecksumHexAddress(data)}</div>
+            <Icon
+              name={copied ? ICON_NAMES.COPY_SUCCESS : ICON_NAMES.COPY}
+              size={ICON_SIZES.SM}
+              marginInlineStart={3}
+            />
+          </div>
+        </Tooltip>
+      )}
     </div>
   );
 }

From 60528413813ea913a7a4805cbb54ed272b57d31c Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 29 Mar 2023 12:44:04 -0500
Subject: [PATCH 086/129] Fix breaking jest test for MMI (#18365)

* Fix breaking jest test for MMI

* Bump coverage threshold

---------

Co-authored-by: Elliot Winkler <elliot.winkler@gmail.com>
Co-authored-by: PeterYinusa <peter.yinusa@consensys.net>
---
 coverage-targets.js                                         | 6 +++---
 .../__snapshots__/compliance-settings.test.js.snap          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/coverage-targets.js b/coverage-targets.js
index e221e9466..6157a706d 100644
--- a/coverage-targets.js
+++ b/coverage-targets.js
@@ -6,10 +6,10 @@
 // subset of files to check against these targets.
 module.exports = {
   global: {
-    lines: 65,
+    lines: 65.5,
     branches: 53.5,
-    statements: 64,
-    functions: 57.4,
+    statements: 64.75,
+    functions: 58,
   },
   transforms: {
     branches: 100,
diff --git a/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap b/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap
index bddb1ef05..946a5a7f5 100644
--- a/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap
+++ b/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap
@@ -44,17 +44,17 @@ exports[`Compliance Settings shows start btn when Compliance its not activated 1
       class="box institutional-feature__content box--flex-direction-row"
     >
       <p
-        class="box mm-text mm-text--body-md mm-text--color-text-default box--padding-bottom-3 box--flex-direction-row"
+        class="box mm-text mm-text--body-md box--padding-bottom-3 box--flex-direction-row box--color-text-default"
       >
         DeFi raises AML/CFT risk for institutions, given the decentralised pools and pseudonymous counterparties.
       </p>
       <p
-        class="box mm-text mm-text--body-md mm-text--color-text-default box--padding-bottom-3 box--flex-direction-row"
+        class="box mm-text mm-text--body-md box--padding-bottom-3 box--flex-direction-row box--color-text-default"
       >
         Codefi Compliance is the only product capable of running AML/CFT analysis on DeFi pools. This allows you to identify and avoid pools and counterparties that fail your risk setting.
       </p>
       <p
-        class="box mm-text mm-text--body-md mm-text--color-text-default box--padding-bottom-3 box--flex-direction-row"
+        class="box mm-text mm-text--body-md box--padding-bottom-3 box--flex-direction-row box--color-text-default"
       >
         Steps to enable AML/CFT Compliance:
       </p>

From 058c571fab0d03d5abd7fd1ff980803231d79425 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:25:01 -0300
Subject: [PATCH 087/129] Fix Sign-in With Ethereum (SIWE) metametric, add
 tests, and clean RPC method middleware event logic (#18008)

* rpc middleware: update comment

* rpc middleware: use errorCodes const

* rpc middleware: only create event props once

* rpc middleware: rn properties -> eventProperties

* rpc middleware: use TransactionStatus const

* rpc middleware: use const for ui_customizations

* rpc middleware: no need to push null eventProp
- also removes === null check which makes this logic a bit more robust

* rpc middleware: rn METRIC..OPTIONS -> METRIC..OPT

* clean: add consistency

* rpc middleware: refactor let msgParams

* lint: rm unused METAMETRIC_KEY

* fix test: do not pass ui_customizations: null

* rpc middleware test: consolidate tests

* rpc middleware: fix siwe event
.push returns length of mutated array

* rpc middleware test: add siwe test

* rpc middleware test: rm redudant set
---
 .../lib/createRPCMethodTrackingMiddleware.js  | 123 +++---------
 .../createRPCMethodTrackingMiddleware.test.js | 188 +++++++++++-------
 shared/constants/metametrics.js               |   8 +-
 3 files changed, 144 insertions(+), 175 deletions(-)

diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
index 8a5186d42..cec5b3308 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -1,12 +1,12 @@
 import { errorCodes } from 'eth-rpc-errors';
 import { MESSAGE_TYPE, ORIGIN_METAMASK } from '../../../shared/constants/app';
+import { TransactionStatus } from '../../../shared/constants/transaction';
 import { SECOND } from '../../../shared/constants/time';
 import { detectSIWE } from '../../../shared/modules/siwe';
 import {
   EVENT,
   EVENT_NAMES,
-  METAMETRIC_KEY_OPTIONS,
-  METAMETRIC_KEY,
+  METAMETRIC_KEY_OPT,
 } from '../../../shared/constants/metametrics';
 
 /**
@@ -41,7 +41,7 @@ const RATE_LIMIT_MAP = {
 
 /**
  * For events with user interaction (approve / reject | cancel) this map will
- * return an object with APPROVED, REJECTED and REQUESTED keys that map to the
+ * return an object with APPROVED, REJECTED, REQUESTED, and FAILED keys that map to the
  * appropriate event names.
  */
 const EVENT_NAME_MAP = {
@@ -142,6 +142,8 @@ export default function createRPCMethodTrackingMiddleware({
     // keys for the various events in the flow.
     const eventType = EVENT_NAME_MAP[method];
 
+    const eventProperties = {};
+
     // Boolean variable that reduces code duplication and increases legibility
     const shouldTrackEvent =
       // Don't track if the request came from our own UI or background
@@ -162,27 +164,21 @@ export default function createRPCMethodTrackingMiddleware({
         ? eventType.REQUESTED
         : EVENT_NAMES.PROVIDER_METHOD_CALLED;
 
-      const properties = {};
-
-      let msgParams;
-
       if (event === EVENT_NAMES.SIGNATURE_REQUESTED) {
-        properties.signature_type = method;
+        eventProperties.signature_type = method;
 
         const data = req?.params?.[0];
         const from = req?.params?.[1];
         const paramsExamplePassword = req?.params?.[2];
 
-        msgParams = {
-          ...paramsExamplePassword,
-          from,
-          data,
-          origin,
-        };
-
         const msgData = {
-          msgParams,
-          status: 'unapproved',
+          msgParams: {
+            ...paramsExamplePassword,
+            from,
+            data,
+            origin,
+          },
+          status: TransactionStatus.unapproved,
           type: req.method,
         };
 
@@ -193,25 +189,21 @@ export default function createRPCMethodTrackingMiddleware({
           );
 
           if (securityProviderResponse?.flagAsDangerous === 1) {
-            properties.ui_customizations = ['flagged_as_malicious'];
+            eventProperties.ui_customizations = [
+              METAMETRIC_KEY_OPT.ui_customizations.flaggedAsMalicious,
+            ];
           } else if (securityProviderResponse?.flagAsDangerous === 2) {
-            properties.ui_customizations = ['flagged_as_safety_unknown'];
-          } else {
-            properties.ui_customizations = null;
+            eventProperties.ui_customizations = [
+              METAMETRIC_KEY_OPT.ui_customizations.flaggedAsSafetyUnknown,
+            ];
           }
 
           if (method === MESSAGE_TYPE.PERSONAL_SIGN) {
             const { isSIWEMessage } = detectSIWE({ data });
             if (isSIWEMessage) {
-              properties.ui_customizations === null
-                ? (properties.ui_customizations = [
-                    METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS]
-                      .SIWE,
-                  ])
-                : properties.ui_customizations.push(
-                    METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS]
-                      .SIWE,
-                  );
+              eventProperties.ui_customizations = (
+                eventProperties.ui_customizations || []
+              ).concat(METAMETRIC_KEY_OPT.ui_customizations.SIWE);
             }
           }
         } catch (e) {
@@ -220,7 +212,7 @@ export default function createRPCMethodTrackingMiddleware({
           );
         }
       } else {
-        properties.method = method;
+        eventProperties.method = method;
       }
 
       trackEvent({
@@ -229,7 +221,7 @@ export default function createRPCMethodTrackingMiddleware({
         referrer: {
           url: origin,
         },
-        properties,
+        properties: eventProperties,
       });
 
       rateLimitTimeouts[method] = setTimeout(() => {
@@ -242,8 +234,6 @@ export default function createRPCMethodTrackingMiddleware({
         return callback();
       }
 
-      const properties = {};
-
       // The rpc error methodNotFound implies that 'eth_sign' is disabled in Advanced Settings
       const isDisabledEthSignAdvancedSetting =
         method === MESSAGE_TYPE.ETH_SIGN &&
@@ -254,79 +244,20 @@ export default function createRPCMethodTrackingMiddleware({
       let event;
       if (isDisabledRPCMethod) {
         event = eventType.FAILED;
-        properties.error = res.error;
-      } else if (res.error?.code === 4001) {
+        eventProperties.error = res.error;
+      } else if (res.error?.code === errorCodes.provider.userRejectedRequest) {
         event = eventType.REJECTED;
       } else {
         event = eventType.APPROVED;
       }
 
-      let msgParams;
-
-      if (eventType.REQUESTED === EVENT_NAMES.SIGNATURE_REQUESTED) {
-        properties.signature_type = method;
-
-        const data = req?.params?.[0];
-        const from = req?.params?.[1];
-        const paramsExamplePassword = req?.params?.[2];
-
-        msgParams = {
-          ...paramsExamplePassword,
-          from,
-          data,
-          origin,
-        };
-
-        const msgData = {
-          msgParams,
-          status: 'unapproved',
-          type: req.method,
-        };
-
-        try {
-          const securityProviderResponse = await securityProviderRequest(
-            msgData,
-            req.method,
-          );
-
-          if (securityProviderResponse?.flagAsDangerous === 1) {
-            properties.ui_customizations = ['flagged_as_malicious'];
-          } else if (securityProviderResponse?.flagAsDangerous === 2) {
-            properties.ui_customizations = ['flagged_as_safety_unknown'];
-          } else {
-            properties.ui_customizations = null;
-          }
-
-          if (method === MESSAGE_TYPE.PERSONAL_SIGN) {
-            const { isSIWEMessage } = detectSIWE({ data });
-            if (isSIWEMessage) {
-              properties.ui_customizations === null
-                ? (properties.ui_customizations = [
-                    METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS]
-                      .SIWE,
-                  ])
-                : properties.ui_customizations.push(
-                    METAMETRIC_KEY_OPTIONS[METAMETRIC_KEY.UI_CUSTOMIZATIONS]
-                      .SIWE,
-                  );
-            }
-          }
-        } catch (e) {
-          console.warn(
-            `createRPCMethodTrackingMiddleware: Error calling securityProviderRequest - ${e}`,
-          );
-        }
-      } else {
-        properties.method = method;
-      }
-
       trackEvent({
         event,
         category: EVENT.CATEGORIES.INPAGE_PROVIDER,
         referrer: {
           url: origin,
         },
-        properties,
+        properties: eventProperties,
       });
 
       return callback();
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
index af910279e..5be404f43 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
@@ -1,7 +1,11 @@
 import { errorCodes } from 'eth-rpc-errors';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
-import { EVENT_NAMES } from '../../../shared/constants/metametrics';
+import {
+  EVENT_NAMES,
+  METAMETRIC_KEY_OPT,
+} from '../../../shared/constants/metametrics';
 import { SECOND } from '../../../shared/constants/time';
+import { detectSIWE } from '../../../shared/modules/siwe';
 import createRPCMethodTrackingMiddleware from './createRPCMethodTrackingMiddleware';
 
 const trackEvent = jest.fn();
@@ -52,6 +56,12 @@ function getNext(timeout = 500) {
 const waitForSeconds = async (seconds) =>
   await new Promise((resolve) => setTimeout(resolve, SECOND * seconds));
 
+jest.mock('../../../shared/modules/siwe', () => ({
+  detectSIWE: jest.fn().mockImplementation(() => {
+    return { isSIWEMessage: false };
+  }),
+}));
+
 describe('createRPCMethodTrackingMiddleware', () => {
   afterEach(() => {
     jest.resetAllMocks();
@@ -153,7 +163,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       };
 
       const res = {
-        error: { code: 4001 },
+        error: { code: errorCodes.provider.userRejectedRequest },
       };
       const { next, executeMiddlewareStack } = getNext();
       await handler(req, res, next);
@@ -230,6 +240,36 @@ describe('createRPCMethodTrackingMiddleware', () => {
       expect(trackEvent.mock.calls[1][0].properties.method).toBe('eth_chainId');
     });
 
+    it('should track Sign-in With Ethereum (SIWE) message if detected', async () => {
+      const req = {
+        method: MESSAGE_TYPE.PERSONAL_SIGN,
+        origin: 'some.dapp',
+      };
+      const res = {
+        error: null,
+      };
+      const { next, executeMiddlewareStack } = getNext();
+
+      detectSIWE.mockImplementation(() => {
+        return { isSIWEMessage: true };
+      });
+
+      await handler(req, res, next);
+      await executeMiddlewareStack();
+
+      expect(trackEvent).toHaveBeenCalledTimes(2);
+
+      expect(trackEvent.mock.calls[1][0]).toMatchObject({
+        category: 'inpage_provider',
+        event: EVENT_NAMES.SIGNATURE_APPROVED,
+        properties: {
+          signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
+          ui_customizations: [METAMETRIC_KEY_OPT.ui_customizations.SIWE],
+        },
+        referrer: { url: 'some.dapp' },
+      });
+    });
+
     describe(`when '${MESSAGE_TYPE.ETH_SIGN}' is disabled in advanced settings`, () => {
       it(`should track ${EVENT_NAMES.SIGNATURE_FAILED} and include error property`, async () => {
         const mockError = { code: errorCodes.rpc.methodNotFound };
@@ -258,93 +298,89 @@ describe('createRPCMethodTrackingMiddleware', () => {
         });
       });
     });
-  });
 
-  describe('participateInMetaMetrics is set to true with a request flagged as safe', () => {
-    beforeEach(() => {
-      metricsState.participateInMetaMetrics = true;
-    });
+    describe('when request is flagged as safe by security provider', () => {
+      it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event`, async () => {
+        const req = {
+          method: MESSAGE_TYPE.ETH_SIGN,
+          origin: 'some.dapp',
+        };
+        const res = {
+          error: null,
+        };
+        const { next } = getNext();
 
-    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as safe`, async () => {
-      const req = {
-        method: MESSAGE_TYPE.ETH_SIGN,
-        origin: 'some.dapp',
-      };
+        await handler(req, res, next);
 
-      const res = {
-        error: null,
-      };
-      const { next } = getNext();
-      await handler(req, res, next);
-      expect(trackEvent).toHaveBeenCalledTimes(1);
-      expect(trackEvent.mock.calls[0][0]).toMatchObject({
-        category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_REQUESTED,
-        properties: {
-          signature_type: MESSAGE_TYPE.ETH_SIGN,
-          ui_customizations: null,
-        },
-        referrer: { url: 'some.dapp' },
+        expect(trackEvent).toHaveBeenCalledTimes(1);
+        expect(trackEvent.mock.calls[0][0]).toMatchObject({
+          category: 'inpage_provider',
+          event: EVENT_NAMES.SIGNATURE_REQUESTED,
+          properties: {
+            signature_type: MESSAGE_TYPE.ETH_SIGN,
+          },
+          referrer: { url: 'some.dapp' },
+        });
       });
     });
-  });
 
-  describe('participateInMetaMetrics is set to true with a request flagged as malicious', () => {
-    beforeEach(() => {
-      metricsState.participateInMetaMetrics = true;
-      flagAsDangerous = 1;
-    });
+    describe('when request is flagged as malicious by security provider', () => {
+      beforeEach(() => {
+        flagAsDangerous = 1;
+      });
 
-    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as malicious`, async () => {
-      const req = {
-        method: MESSAGE_TYPE.ETH_SIGN,
-        origin: 'some.dapp',
-      };
+      it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as malicious`, async () => {
+        const req = {
+          method: MESSAGE_TYPE.ETH_SIGN,
+          origin: 'some.dapp',
+        };
+        const res = {
+          error: null,
+        };
+        const { next } = getNext();
 
-      const res = {
-        error: null,
-      };
-      const { next } = getNext();
-      await handler(req, res, next);
-      expect(trackEvent).toHaveBeenCalledTimes(1);
-      expect(trackEvent.mock.calls[0][0]).toMatchObject({
-        category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_REQUESTED,
-        properties: {
-          signature_type: MESSAGE_TYPE.ETH_SIGN,
-          ui_customizations: ['flagged_as_malicious'],
-        },
-        referrer: { url: 'some.dapp' },
+        await handler(req, res, next);
+
+        expect(trackEvent).toHaveBeenCalledTimes(1);
+        expect(trackEvent.mock.calls[0][0]).toMatchObject({
+          category: 'inpage_provider',
+          event: EVENT_NAMES.SIGNATURE_REQUESTED,
+          properties: {
+            signature_type: MESSAGE_TYPE.ETH_SIGN,
+            ui_customizations: ['flagged_as_malicious'],
+          },
+          referrer: { url: 'some.dapp' },
+        });
       });
     });
-  });
 
-  describe('participateInMetaMetrics is set to true with a request flagged as safety unknown', () => {
-    beforeEach(() => {
-      metricsState.participateInMetaMetrics = true;
-      flagAsDangerous = 2;
-    });
+    describe('when request flagged as safety unknown by security provider', () => {
+      beforeEach(() => {
+        flagAsDangerous = 2;
+      });
 
-    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as safety unknown`, async () => {
-      const req = {
-        method: MESSAGE_TYPE.ETH_SIGN,
-        origin: 'some.dapp',
-      };
+      it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as safety unknown`, async () => {
+        const req = {
+          method: MESSAGE_TYPE.ETH_SIGN,
+          origin: 'some.dapp',
+        };
+        const res = {
+          error: null,
+        };
+        const { next } = getNext();
 
-      const res = {
-        error: null,
-      };
-      const { next } = getNext();
-      await handler(req, res, next);
-      expect(trackEvent).toHaveBeenCalledTimes(1);
-      expect(trackEvent.mock.calls[0][0]).toMatchObject({
-        category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_REQUESTED,
-        properties: {
-          signature_type: MESSAGE_TYPE.ETH_SIGN,
-          ui_customizations: ['flagged_as_safety_unknown'],
-        },
-        referrer: { url: 'some.dapp' },
+        await handler(req, res, next);
+
+        expect(trackEvent).toHaveBeenCalledTimes(1);
+        expect(trackEvent.mock.calls[0][0]).toMatchObject({
+          category: 'inpage_provider',
+          event: EVENT_NAMES.SIGNATURE_REQUESTED,
+          properties: {
+            signature_type: MESSAGE_TYPE.ETH_SIGN,
+            ui_customizations: ['flagged_as_safety_unknown'],
+          },
+          referrer: { url: 'some.dapp' },
+        });
       });
     });
   });
diff --git a/shared/constants/metametrics.js b/shared/constants/metametrics.js
index a9691d5a2..de3244c42 100644
--- a/shared/constants/metametrics.js
+++ b/shared/constants/metametrics.js
@@ -462,17 +462,19 @@ export const CONTEXT_PROPS = {
 };
 
 /**
- * These types correspond to the keys in the METAMETRIC_KEY_OPTIONS object
+ * These types correspond to the keys in the METAMETRIC_KEY_OPT object
  */
 export const METAMETRIC_KEY = {
   UI_CUSTOMIZATIONS: `ui_customizations`,
 };
 
 /**
- * This object maps a method name to a METAMETRIC_KEY
+ * This object maps a METAMETRIC_KEY to an object of possible options
  */
-export const METAMETRIC_KEY_OPTIONS = {
+export const METAMETRIC_KEY_OPT = {
   [METAMETRIC_KEY.UI_CUSTOMIZATIONS]: {
+    flaggedAsMalicious: 'flagged_as_malicious',
+    flaggedAsSafetyUnknown: 'flagged_as_safety_unknown',
     SIWE: 'sign_in_with_ethereum',
   },
 };

From 27f3af80bdc71c141e92aa48787326ae59b71f68 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Wed, 29 Mar 2023 20:11:08 +0100
Subject: [PATCH 088/129] Revert "Fix(18190): add tabs to permission when
 initializing app (#18218)" (#18336)

This reverts commit 1eb102fd964952d5d2b9a53070b0c868cbfe59bd.
---
 app/manifest/v2/_base.json   | 14 ++++++++++++++
 app/manifest/v2/chrome.json  | 16 +---------------
 app/manifest/v2/firefox.json | 17 +----------------
 app/manifest/v3/_base.json   | 10 ++++++++++
 app/manifest/v3/chrome.json  | 16 +---------------
 app/manifest/v3/firefox.json | 17 +----------------
 6 files changed, 28 insertions(+), 62 deletions(-)

diff --git a/app/manifest/v2/_base.json b/app/manifest/v2/_base.json
index 39b289197..f962de618 100644
--- a/app/manifest/v2/_base.json
+++ b/app/manifest/v2/_base.json
@@ -60,5 +60,19 @@
   },
   "manifest_version": 2,
   "name": "__MSG_appName__",
+  "permissions": [
+    "storage",
+    "unlimitedStorage",
+    "clipboardWrite",
+    "http://localhost:8545/",
+    "https://*.infura.io/",
+    "https://*.codefi.network/",
+    "https://chainid.network/chains.json",
+    "https://lattice.gridplus.io/*",
+    "activeTab",
+    "webRequest",
+    "*://*.eth/",
+    "notifications"
+  ],
   "short_name": "__MSG_appName__"
 }
diff --git a/app/manifest/v2/chrome.json b/app/manifest/v2/chrome.json
index 9c0e95ec5..a152130d8 100644
--- a/app/manifest/v2/chrome.json
+++ b/app/manifest/v2/chrome.json
@@ -4,19 +4,5 @@
     "matches": ["https://metamask.io/*"],
     "ids": ["*"]
   },
-  "minimum_chrome_version": "80",
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://*.codefi.network/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "activeTab",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ]
+  "minimum_chrome_version": "80"
 }
diff --git a/app/manifest/v2/firefox.json b/app/manifest/v2/firefox.json
index 5adf04713..d50b26a27 100644
--- a/app/manifest/v2/firefox.json
+++ b/app/manifest/v2/firefox.json
@@ -4,20 +4,5 @@
       "id": "webextension@metamask.io",
       "strict_min_version": "78.0"
     }
-  },
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://*.codefi.network/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "activeTab",
-    "tabs",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ]
+  }
 }
diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json
index 3beeb7379..1b9456fd8 100644
--- a/app/manifest/v3/_base.json
+++ b/app/manifest/v3/_base.json
@@ -65,5 +65,15 @@
   },
   "manifest_version": 3,
   "name": "__MSG_appName__",
+  "permissions": [
+    "activeTab",
+    "alarms",
+    "clipboardWrite",
+    "notifications",
+    "scripting",
+    "storage",
+    "unlimitedStorage",
+    "webRequest"
+  ],
   "short_name": "__MSG_appName__"
 }
diff --git a/app/manifest/v3/chrome.json b/app/manifest/v3/chrome.json
index dbb0ee22c..486692539 100644
--- a/app/manifest/v3/chrome.json
+++ b/app/manifest/v3/chrome.json
@@ -6,19 +6,5 @@
     "matches": ["https://metamask.io/*"],
     "ids": ["*"]
   },
-  "minimum_chrome_version": "80",
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://*.codefi.network/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "activeTab",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ]
+  "minimum_chrome_version": "80"
 }
diff --git a/app/manifest/v3/firefox.json b/app/manifest/v3/firefox.json
index 67ecf7b09..5f0e5672f 100644
--- a/app/manifest/v3/firefox.json
+++ b/app/manifest/v3/firefox.json
@@ -22,20 +22,5 @@
     "default_title": "MetaMask",
     "default_popup": "popup.html"
   },
-  "manifest_version": 2,
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://*.codefi.network/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "tabs",
-    "activeTab",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ]
+  "manifest_version": 2
 }

From c2b2f2685e71a4b1289216324c39535532caa436 Mon Sep 17 00:00:00 2001
From: Hassan Malik <41640681+hmalik88@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:17:57 -0400
Subject: [PATCH 089/129] [FLASK] Redesign key management modal (#18263)

* added the rest of the sev1 warnings to getSnapInstallWarnings

* added and updated translations

* Updated getSnapInstallWarnings to include warnings for all weight-1 permissions

* Updated snap install warning and css according to designs

* fix snaps tests

* fixed alignment/spacing

* updated e2e tests to click through the newly displayed public key access warning

* lint fix

* fixed update snap test

* refactored getSnapInstallWarnings, moved logic to PERMISSION_DESCRIPTIONS

* fix logic to account for objects & arrays

* update function description

* add missing properties to ethereum provider description

* moved id and message to baseDescription to fix error

* add optional chaining to fix undefined error

* more optional chaining

* more optional chaining
---
 app/_locales/en/messages.json                 |  10 +-
 test/e2e/snaps/test-snap-bip-32.spec.js       |   5 +-
 test/e2e/snaps/test-snap-rpc.spec.js          |   5 +-
 test/e2e/snaps/test-snap-update.spec.js       |   5 +-
 .../connected-accounts-permissions.js         |   6 +-
 .../app/flask/snap-install-warning/index.scss |   4 +
 .../snap-install-warning.js                   |  33 ++--
 ui/helpers/utils/permission.js                | 147 ++++++++++++++----
 ui/helpers/utils/util.js                      |   2 +-
 ui/pages/permissions-connect/flask/util.js    |  96 ++++--------
 10 files changed, 197 insertions(+), 116 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index b194112a5..17a25f726 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1365,6 +1365,10 @@
   "ethGasPriceFetchWarning": {
     "message": "Backup gas price is provided as the main gas estimation service is unavailable right now."
   },
+  "ethereumProviderAccess": {
+    "message": "Grant Ethereum provider access to $1",
+    "description": "The parameter is the name of the requesting origin"
+  },
   "ethereumPublicAddress": {
     "message": "Ethereum public address"
   },
@@ -3572,7 +3576,11 @@
     "message": "Proceed with caution"
   },
   "snapInstallWarningKeyAccess": {
-    "message": "Grant $2 key access to $1",
+    "message": "Grant $2 account control to $1",
+    "description": "The first parameter is the name of the snap and the second one is the protocol"
+  },
+  "snapInstallWarningPublicKeyAccess": {
+    "message": "Grant $2 public key access to $1",
     "description": "The first parameter is the name of the snap and the second one is the protocol"
   },
   "snapResultError": {
diff --git a/test/e2e/snaps/test-snap-bip-32.spec.js b/test/e2e/snaps/test-snap-bip-32.spec.js
index 2a5174498..2babba866 100644
--- a/test/e2e/snaps/test-snap-bip-32.spec.js
+++ b/test/e2e/snaps/test-snap-bip-32.spec.js
@@ -63,7 +63,10 @@ describe('Test Snap bip-32', function () {
         // wait for permissions popover, click checkboxes and confirm
         await driver.delay(1000);
         await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
-        await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
+        await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-1');
+        await driver.clickElement(
+          '#public-key-access-bip32-m-44h-0h-secp256k1-0',
+        );
         await driver.clickElement({
           text: 'Confirm',
           tag: 'button',
diff --git a/test/e2e/snaps/test-snap-rpc.spec.js b/test/e2e/snaps/test-snap-rpc.spec.js
index 0f512c6fe..3c596ba08 100644
--- a/test/e2e/snaps/test-snap-rpc.spec.js
+++ b/test/e2e/snaps/test-snap-rpc.spec.js
@@ -64,7 +64,10 @@ describe('Test Snap RPC', function () {
         // wait for permissions popover, click checkboxes and confirm
         await driver.delay(1000);
         await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
-        await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
+        await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-1');
+        await driver.clickElement(
+          '#public-key-access-bip32-m-44h-0h-secp256k1-0',
+        );
         await driver.clickElement({
           text: 'Confirm',
           tag: 'button',
diff --git a/test/e2e/snaps/test-snap-update.spec.js b/test/e2e/snaps/test-snap-update.spec.js
index 523356bac..eaf0b847c 100644
--- a/test/e2e/snaps/test-snap-update.spec.js
+++ b/test/e2e/snaps/test-snap-update.spec.js
@@ -64,7 +64,10 @@ describe('Test Snap update', function () {
         // wait for permissions popover, click checkboxes and confirm
         await driver.delay(1000);
         await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
-        await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
+        await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-1');
+        await driver.clickElement(
+          '#public-key-access-bip32-m-44h-0h-secp256k1-0',
+        );
         await driver.clickElement({
           text: 'Confirm',
           tag: 'button',
diff --git a/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js b/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js
index 641dc6e70..10f032424 100644
--- a/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js
+++ b/ui/components/app/connected-accounts-permissions/connected-accounts-permissions.js
@@ -20,7 +20,11 @@ const ConnectedAccountsPermissions = ({ permissions }) => {
 
   const permissionLabels = flatten(
     permissions.map(({ key, value }) =>
-      getPermissionDescription(t, key, value),
+      getPermissionDescription({
+        t,
+        permissionName: key,
+        permissionValue: value,
+      }),
     ),
   );
 
diff --git a/ui/components/app/flask/snap-install-warning/index.scss b/ui/components/app/flask/snap-install-warning/index.scss
index bc7d078bd..ddbf9c8d4 100644
--- a/ui/components/app/flask/snap-install-warning/index.scss
+++ b/ui/components/app/flask/snap-install-warning/index.scss
@@ -1,4 +1,8 @@
 .snap-install-warning {
+  .popover-header {
+    padding-bottom: 0;
+  }
+
   .checkbox-label {
     @include H7;
 
diff --git a/ui/components/app/flask/snap-install-warning/snap-install-warning.js b/ui/components/app/flask/snap-install-warning/snap-install-warning.js
index 70cedf0d2..15c593c74 100644
--- a/ui/components/app/flask/snap-install-warning/snap-install-warning.js
+++ b/ui/components/app/flask/snap-install-warning/snap-install-warning.js
@@ -6,12 +6,17 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 import CheckBox from '../../../ui/check-box/check-box.component';
 
 import {
+  BackgroundColor,
+  IconColor,
   TextVariant,
   TEXT_ALIGN,
+  Size,
+  JustifyContent,
 } from '../../../../helpers/constants/design-system';
 import Popover from '../../../ui/popover';
 import Button from '../../../ui/button';
-import { Text } from '../../../component-library';
+import { AvatarIcon, ICON_NAMES, Text } from '../../../component-library';
+import Box from '../../../ui/box/box';
 
 /**
  * a very simple reducer using produce from Immer to keep checkboxes state manipulation
@@ -45,13 +50,6 @@ export default function SnapInstallWarning({ onCancel, onSubmit, warnings }) {
   const SnapInstallWarningFooter = () => {
     return (
       <div className="snap-install-warning__footer">
-        <Button
-          className="snap-install-warning__footer-button"
-          type="default"
-          onClick={onCancel}
-        >
-          {t('cancel')}
-        </Button>
         <Button
           className="snap-install-warning__footer-button"
           type="primary"
@@ -67,8 +65,6 @@ export default function SnapInstallWarning({ onCancel, onSubmit, warnings }) {
   return (
     <Popover
       className="snap-install-warning"
-      title={t('snapInstallWarningHeading')}
-      centerTitle
       footer={<SnapInstallWarningFooter />}
       headerProps={{ padding: [6, 6, 0] }}
       contentProps={{
@@ -78,7 +74,24 @@ export default function SnapInstallWarning({ onCancel, onSubmit, warnings }) {
         paddingBottom: [6, 4],
       }}
       footerProps={{ padding: [4, 6] }}
+      onClose={onCancel}
     >
+      <Box justifyContent={JustifyContent.center} marginBottom={6}>
+        <AvatarIcon
+          iconName={ICON_NAMES.DANGER}
+          backgroundColor={BackgroundColor.warningMuted}
+          color={IconColor.warningDefault}
+          size={Size.LG}
+        />
+      </Box>
+      <Text
+        paddingBottom={6}
+        textAlign={TEXT_ALIGN.CENTER}
+        variant={TextVariant.headingSm}
+        as="h2"
+      >
+        {t('snapInstallWarningHeading')}
+      </Text>
       <Text paddingBottom={6} textAlign={TEXT_ALIGN.CENTER}>
         {warnings.length > 1
           ? t('snapInstallWarningCheckPlural')
diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js
index 41d8df434..6987b1d7f 100644
--- a/ui/helpers/utils/permission.js
+++ b/ui/helpers/utils/permission.js
@@ -18,12 +18,18 @@ import {
   AvatarIcon,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   Icon,
+  Text,
   ///: END:ONLY_INCLUDE_IN
   ICON_NAMES,
   ICON_SIZES,
 } from '../../components/component-library';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
-import { IconColor } from '../constants/design-system';
+import {
+  IconColor,
+  Color,
+  FONT_WEIGHT,
+  TextVariant,
+} from '../constants/design-system';
 import {
   coinTypeToProtocolName,
   getSnapDerivationPathName,
@@ -63,41 +69,63 @@ function getLeftIcon(iconName) {
   );
 }
 
-const PERMISSION_DESCRIPTIONS = deepFreeze({
-  [RestrictedMethods.eth_accounts]: (t) => ({
+export const PERMISSION_DESCRIPTIONS = deepFreeze({
+  [RestrictedMethods.eth_accounts]: ({ t }) => ({
     label: t('permission_ethereumAccounts'),
     leftIcon: getLeftIcon(ICON_NAMES.EYE),
     rightIcon: null,
     weight: 2,
   }),
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  [RestrictedMethods.snap_confirm]: (t) => ({
+  [RestrictedMethods.snap_confirm]: ({ t }) => ({
     label: t('permission_customConfirmation'),
     description: t('permission_customConfirmationDescription'),
     leftIcon: getLeftIcon(ICON_NAMES.SECURITY_TICK),
     rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
-  [RestrictedMethods.snap_dialog]: (t) => ({
+  [RestrictedMethods.snap_dialog]: ({ t }) => ({
     label: t('permission_dialog'),
     description: t('permission_dialogDescription'),
     leftIcon: getLeftIcon(ICON_NAMES.MESSAGES),
     rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
-  [RestrictedMethods.snap_notify]: (t) => ({
+  [RestrictedMethods.snap_notify]: ({ t }) => ({
     label: t('permission_notifications'),
     description: t('permission_notificationsDescription'),
     leftIcon: getLeftIcon(ICON_NAMES.NOTIFICATION),
     rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
-  [RestrictedMethods.snap_getBip32PublicKey]: (t, _, permissionValue) =>
-    permissionValue.caveats[0].value.map(({ path, curve }) => {
+  [RestrictedMethods.snap_getBip32PublicKey]: ({
+    t,
+    permissionValue,
+    targetSubjectMetadata,
+  }) =>
+    permissionValue.caveats[0].value.map(({ path, curve }, i) => {
       const baseDescription = {
         leftIcon: getLeftIcon(ICON_NAMES.SECURITY_SEARCH),
         rightIcon: RIGHT_WARNING_ICON,
         weight: 1,
+        id: `public-key-access-bip32-${path
+          .join('-')
+          ?.replace(/'/gu, 'h')}-${curve}-${i}`,
+        message: t('snapInstallWarningPublicKeyAccess', [
+          <Text
+            key="1"
+            color={Color.primaryDefault}
+            fontWeight={FONT_WEIGHT.BOLD}
+            variant={TextVariant.bodySm}
+            as="span"
+          >
+            {getSnapName(targetSubjectMetadata?.origin)}
+          </Text>,
+          <b key="2">
+            {getSnapDerivationPathName(path, curve) ??
+              `${path.join('/')} (${curve})`}
+          </b>,
+        ]),
       };
 
       const friendlyName = getSnapDerivationPathName(path, curve);
@@ -141,12 +169,34 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
         ]),
       };
     }),
-  [RestrictedMethods.snap_getBip32Entropy]: (t, _, permissionValue) =>
-    permissionValue.caveats[0].value.map(({ path, curve }) => {
+  [RestrictedMethods.snap_getBip32Entropy]: ({
+    t,
+    permissionValue,
+    targetSubjectMetadata,
+  }) =>
+    permissionValue.caveats[0].value.map(({ path, curve }, i) => {
       const baseDescription = {
         leftIcon: getLeftIcon(ICON_NAMES.KEY),
         rightIcon: RIGHT_WARNING_ICON,
         weight: 1,
+        id: `key-access-bip32-${path
+          .join('-')
+          ?.replace(/'/gu, 'h')}-${curve}-${i}`,
+        message: t('snapInstallWarningKeyAccess', [
+          <Text
+            key="1"
+            color={Color.primaryDefault}
+            fontWeight={FONT_WEIGHT.BOLD}
+            variant={TextVariant.bodySm}
+            as="span"
+          >
+            {getSnapName(targetSubjectMetadata?.origin)}
+          </Text>,
+          <b key="2">
+            {getSnapDerivationPathName(path, curve) ??
+              `${path.join('/')} (${curve})`}
+          </b>,
+        ]),
       };
 
       const friendlyName = getSnapDerivationPathName(path, curve);
@@ -190,8 +240,12 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
         ]),
       };
     }),
-  [RestrictedMethods.snap_getBip44Entropy]: (t, _, permissionValue) =>
-    permissionValue.caveats[0].value.map(({ coinType }) => ({
+  [RestrictedMethods.snap_getBip44Entropy]: ({
+    t,
+    permissionValue,
+    targetSubjectMetadata,
+  }) =>
+    permissionValue.caveats[0].value.map(({ coinType }, i) => ({
       label: t('permission_manageBip44Keys', [
         <span className="permission-label-item" key={`coin-type-${coinType}`}>
           {coinTypeToProtocolName(coinType) ||
@@ -210,22 +264,38 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
       leftIcon: getLeftIcon(ICON_NAMES.KEY),
       rightIcon: RIGHT_WARNING_ICON,
       weight: 1,
+      id: `key-access-bip44-${coinType}-${i}`,
+      message: t('snapInstallWarningKeyAccess', [
+        <Text
+          key="1"
+          color={Color.primaryDefault}
+          fontWeight={FONT_WEIGHT.BOLD}
+          variant={TextVariant.bodySm}
+          as="span"
+        >
+          {getSnapName(targetSubjectMetadata?.origin)}
+        </Text>,
+        <b key="2">
+          {coinTypeToProtocolName(coinType) ||
+            t('unrecognizedProtocol', [coinType])}
+        </b>,
+      ]),
     })),
-  [RestrictedMethods.snap_getEntropy]: (t) => ({
+  [RestrictedMethods.snap_getEntropy]: ({ t }) => ({
     label: t('permission_getEntropy'),
     description: t('permission_getEntropyDescription'),
     leftIcon: getLeftIcon(ICON_NAMES.SECURITY_KEY),
     rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
-  [RestrictedMethods.snap_manageState]: (t) => ({
+  [RestrictedMethods.snap_manageState]: ({ t }) => ({
     label: t('permission_manageState'),
     description: t('permission_manageStateDescription'),
     leftIcon: getLeftIcon(ICON_NAMES.ADD_SQUARE),
     rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
-  [RestrictedMethods.wallet_snap]: (t, _, permissionValue) => {
+  [RestrictedMethods.wallet_snap]: ({ t, permissionValue }) => {
     const snaps = permissionValue.caveats[0].value;
     const baseDescription = {
       leftIcon: getLeftIcon(ICON_NAMES.FLASH),
@@ -253,32 +323,31 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
       };
     });
   },
-  [EndowmentPermissions['endowment:network-access']]: (t) => ({
+  [EndowmentPermissions['endowment:network-access']]: ({ t }) => ({
     label: t('permission_accessNetwork'),
     description: t('permission_accessNetworkDescription'),
     leftIcon: getLeftIcon(ICON_NAMES.GLOBAL),
     rightIcon: RIGHT_INFO_ICON,
     weight: 2,
   }),
-  [EndowmentPermissions['endowment:webassembly']]: (t) => ({
+  [EndowmentPermissions['endowment:webassembly']]: ({ t }) => ({
     label: t('permission_webAssembly'),
     description: t('permission_webAssemblyDescription'),
     leftIcon: 'fas fa-microchip',
     rightIcon: null,
     weight: 2,
   }),
-  [EndowmentPermissions['endowment:long-running']]: (t) => ({
+  [EndowmentPermissions['endowment:long-running']]: ({ t }) => ({
     label: t('permission_longRunning'),
     description: t('permission_longRunningDescription'),
     leftIcon: getLeftIcon(ICON_NAMES.LINK),
     rightIcon: RIGHT_INFO_ICON,
     weight: 3,
   }),
-  [EndowmentPermissions['endowment:transaction-insight']]: (
+  [EndowmentPermissions['endowment:transaction-insight']]: ({
     t,
-    _,
     permissionValue,
-  ) => {
+  }) => {
     const baseDescription = {
       leftIcon: getLeftIcon(ICON_NAMES.SPEEDOMETER),
       rightIcon: RIGHT_INFO_ICON,
@@ -308,21 +377,26 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
 
     return result;
   },
-  [EndowmentPermissions['endowment:cronjob']]: (t) => ({
+  [EndowmentPermissions['endowment:cronjob']]: ({ t }) => ({
     label: t('permission_cronjob'),
     description: t('permission_cronjobDescription'),
     leftIcon: getLeftIcon(ICON_NAMES.CLOCK),
     rightIcon: RIGHT_INFO_ICON,
     weight: 2,
   }),
-  [EndowmentPermissions['endowment:ethereum-provider']]: (t) => ({
+  [EndowmentPermissions['endowment:ethereum-provider']]: ({
+    t,
+    targetSubjectMetadata,
+  }) => ({
     label: t('permission_ethereumProvider'),
     description: t('permission_ethereumProviderDescription'),
     leftIcon: getLeftIcon(ICON_NAMES.ETHEREUM),
     rightIcon: RIGHT_INFO_ICON,
     weight: 1,
+    id: 'ethereum-provider-access',
+    message: t('ethereumProviderAccess', [targetSubjectMetadata?.origin]),
   }),
-  [EndowmentPermissions['endowment:rpc']]: (t, _, permissionValue) => {
+  [EndowmentPermissions['endowment:rpc']]: ({ t, permissionValue }) => {
     const baseDescription = {
       leftIcon: getLeftIcon(ICON_NAMES.HIERARCHY),
       rightIcon: RIGHT_INFO_ICON,
@@ -351,7 +425,7 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
     return results;
   },
   ///: END:ONLY_INCLUDE_IN
-  [UNKNOWN_PERMISSION]: (t, permissionName) => ({
+  [UNKNOWN_PERMISSION]: ({ t, permissionName }) => ({
     label: t('permission_unknown', [permissionName ?? 'undefined']),
     leftIcon: getLeftIcon(ICON_NAMES.QUESTION),
     rightIcon: null,
@@ -372,23 +446,32 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
  */
 
 /**
- * @param {Function} t - The translation function
- * @param {string} permissionName - The name of the permission to request
- * @param {object} permissionValue - The value of the permission to request
+ * @typedef {object} PermissionDescriptionParamsObject
+ * @property {Function} t - The translation function.
+ * @property {string} permissionName - The name of the permission.
+ * @property {object} permissionValue - The permission object.
+ * @property {object} targetSubjectMetadata - Subject metadata.
+ */
+
+/**
+ * @param {PermissionDescriptionParamsObject} params - The permission description params object.
+ * @param {Function} params.t - The translation function.
+ * @param {string} params.permissionName - The name of the permission to request
+ * @param {object} params.permissionValue - The value of the permission to request
  * @returns {PermissionLabelObject[]}
  */
-export const getPermissionDescription = (
+export const getPermissionDescription = ({
   t,
   permissionName,
   permissionValue,
-) => {
+}) => {
   let value = PERMISSION_DESCRIPTIONS[UNKNOWN_PERMISSION];
 
   if (Object.hasOwnProperty.call(PERMISSION_DESCRIPTIONS, permissionName)) {
     value = PERMISSION_DESCRIPTIONS[permissionName];
   }
 
-  const result = value(t, permissionName, permissionValue);
+  const result = value({ t, permissionName, permissionValue });
   if (!Array.isArray(result)) {
     return [{ ...result, permissionName, permissionValue }];
   }
@@ -413,7 +496,7 @@ export function getWeightedPermissions(t, permissions) {
     .reduce(
       (target, [permissionName, permissionValue]) =>
         target.concat(
-          getPermissionDescription(t, permissionName, permissionValue),
+          getPermissionDescription({ t, permissionName, permissionValue }),
         ),
       [],
     )
diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index c82988d73..868ab46fb 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -556,7 +556,7 @@ export function getSnapDerivationPathName(path, curve) {
 }
 
 export const removeSnapIdPrefix = (snapId) =>
-  snapId.replace(getSnapPrefix(snapId), '');
+  snapId?.replace(getSnapPrefix(snapId), '');
 
 export const getSnapName = (snapId, subjectMetadata) => {
   if (SNAPS_METADATA[snapId]?.name) {
diff --git a/ui/pages/permissions-connect/flask/util.js b/ui/pages/permissions-connect/flask/util.js
index 8c3ad9364..6711b98a5 100644
--- a/ui/pages/permissions-connect/flask/util.js
+++ b/ui/pages/permissions-connect/flask/util.js
@@ -1,72 +1,32 @@
-import React from 'react';
-import { Text } from '../../../components/component-library';
-import {
-  Color,
-  FONT_WEIGHT,
-  TextVariant,
-} from '../../../helpers/constants/design-system';
-
-import {
-  coinTypeToProtocolName,
-  getSnapName,
-  getSnapDerivationPathName,
-} from '../../../helpers/utils/util';
+import { isObject } from '@metamask/utils';
+import { PERMISSION_DESCRIPTIONS } from '../../../helpers/utils/permission';
 
 export function getSnapInstallWarnings(permissions, targetSubjectMetadata, t) {
-  const bip32EntropyPermissions =
-    permissions &&
-    Object.entries(permissions)
-      .filter(([key]) => key === 'snap_getBip32Entropy')
-      .map(([, value]) => value);
+  const weightOneWarnings = Object.entries(permissions).reduce(
+    (filteredWarnings, [permissionName, permissionValue]) => {
+      const permissionDescription = PERMISSION_DESCRIPTIONS[permissionName]({
+        t,
+        permissionValue,
+        targetSubjectMetadata,
+      });
+      if (Array.isArray(permissionDescription)) {
+        permissionDescription.forEach((description) => {
+          if (description.weight === 1) {
+            const { id, message } = description;
+            filteredWarnings.push({ id, message });
+          }
+        });
+      } else if (
+        isObject(permissionDescription) &&
+        permissionDescription.weight === 1
+      ) {
+        const { id, message } = permissionDescription;
+        filteredWarnings.push({ id, message });
+      }
+      return filteredWarnings;
+    },
+    [],
+  );
 
-  const bip44EntropyPermissions =
-    permissions &&
-    Object.entries(permissions)
-      .filter(([key]) => key === 'snap_getBip44Entropy')
-      .map(([, value]) => value);
-
-  return [
-    ...bip32EntropyPermissions.flatMap((permission, i) =>
-      permission.caveats[0].value.map(({ path, curve }) => ({
-        id: `key-access-bip32-${path
-          .join('-')
-          .replace(/'/gu, 'h')}-${curve}-${i}`,
-        message: t('snapInstallWarningKeyAccess', [
-          <Text
-            key="1"
-            color={Color.primaryDefault}
-            fontWeight={FONT_WEIGHT.BOLD}
-            variant={TextVariant.bodySm}
-            as="span"
-          >
-            {getSnapName(targetSubjectMetadata.origin)}
-          </Text>,
-          <b key="2">
-            {getSnapDerivationPathName(path, curve) ??
-              `${path.join('/')} (${curve})`}
-          </b>,
-        ]),
-      })),
-    ),
-    ...bip44EntropyPermissions.flatMap((permission, i) =>
-      permission.caveats[0].value.map(({ coinType }) => ({
-        id: `key-access-bip44-${coinType}-${i}`,
-        message: t('snapInstallWarningKeyAccess', [
-          <Text
-            key="1"
-            color={Color.primaryDefault}
-            fontWeight={FONT_WEIGHT.BOLD}
-            variant={TextVariant.bodySm}
-            as="span"
-          >
-            {getSnapName(targetSubjectMetadata.origin)}
-          </Text>,
-          <b key="2">
-            {coinTypeToProtocolName(coinType) ||
-              t('unrecognizedProtocol', [coinType])}
-          </b>,
-        ]),
-      })),
-    ),
-  ];
+  return weightOneWarnings;
 }

From f7aea9dc341002427ddae7e37d72fc5a306e13a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Oliv=C3=A9?= <albertolivecorbella@gmail.com>
Date: Thu, 30 Mar 2023 08:33:12 +0200
Subject: [PATCH 090/129] [MMI] Created institutional-entity-done-page
 component (#18096)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Created institutional-entity-done-page component

* Added index file

* Added css file and Boxes

* Fixing prettier formatter

* Fixed prettier format

* Fixing prettier issues

* Fixed prettier

* Adding Text component

* Removed styles and added story

* Moving component to pages and improving styles

---------

Co-authored-by: António Regadas <apregadas@gmail.com>
---
 .../institutional-entity-done-page/index.js   |  1 +
 .../institutional-entity-done-page/index.scss |  9 +++
 .../institutional-entity-done-page.js         | 79 +++++++++++++++++++
 .../institutional-entity-done-page.stories.js | 26 ++++++
 .../institutional-entity-done-page.test.js    | 59 ++++++++++++++
 5 files changed, 174 insertions(+)
 create mode 100644 ui/pages/institutional/institutional-entity-done-page/index.js
 create mode 100644 ui/pages/institutional/institutional-entity-done-page/index.scss
 create mode 100644 ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js
 create mode 100644 ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.stories.js
 create mode 100644 ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.test.js

diff --git a/ui/pages/institutional/institutional-entity-done-page/index.js b/ui/pages/institutional/institutional-entity-done-page/index.js
new file mode 100644
index 000000000..ce802016b
--- /dev/null
+++ b/ui/pages/institutional/institutional-entity-done-page/index.js
@@ -0,0 +1 @@
+export { default } from './institutional-entity-done-page';
diff --git a/ui/pages/institutional/institutional-entity-done-page/index.scss b/ui/pages/institutional/institutional-entity-done-page/index.scss
new file mode 100644
index 000000000..d231a4e66
--- /dev/null
+++ b/ui/pages/institutional/institutional-entity-done-page/index.scss
@@ -0,0 +1,9 @@
+.institutional-entity-done {
+  &__img {
+    max-width: 250px;
+    max-height: 80px;
+    margin-top: 40px;
+    margin-bottom: 20px;
+  }
+}
+
diff --git a/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js
new file mode 100644
index 000000000..164724acf
--- /dev/null
+++ b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.js
@@ -0,0 +1,79 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+import Button from '../../../components/ui/button';
+import { getMostRecentOverviewPage } from '../../../ducks/history/history';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { Text } from '../../../components/component-library';
+import {
+  TextColor,
+  BorderRadius,
+  TypographyVariant,
+} from '../../../helpers/constants/design-system';
+import Box from '../../../components/ui/box';
+
+export default function InstitutionalEntityDonePage(props) {
+  const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
+  const t = useI18nContext();
+  const { history, location } = props;
+  const { state } = location;
+
+  return (
+    <Box borderRadius={BorderRadius.none}>
+      <Box className="page-container__content">
+        <Box
+          paddingBottom={6}
+          paddingLeft={6}
+          paddingRight={6}
+          className="institutional-entity-done__form"
+        >
+          <Box
+            display={['flex']}
+            flexDirection={['column']}
+            alignItems={['center']}
+          >
+            <img
+              className="institutional-entity-done__img"
+              src={state.imgSrc}
+              alt="Entity image"
+            />
+            <Text
+              as="h4"
+              marginTop={4}
+              marginBottom={4}
+              color={TextColor.textDefault}
+            >
+              {state.title}
+            </Text>
+            <Text
+              as="p"
+              color={TextColor.textAlternative}
+              marginTop={2}
+              marginBottom={5}
+              variant={TypographyVariant.headingSm}
+            >
+              {state.description}
+            </Text>
+          </Box>
+        </Box>
+      </Box>
+      <Box className="page-container__footer">
+        <footer>
+          <Button
+            type="primary"
+            large
+            data-testid="click-most-recent-overview-page"
+            onClick={() => history.push(mostRecentOverviewPage)}
+          >
+            <Text>{t('close')}</Text>
+          </Button>
+        </footer>
+      </Box>
+    </Box>
+  );
+}
+
+InstitutionalEntityDonePage.propTypes = {
+  history: PropTypes.object,
+  location: PropTypes.object,
+};
diff --git a/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.stories.js b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.stories.js
new file mode 100644
index 000000000..7c7ea8df0
--- /dev/null
+++ b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.stories.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import InstitutionalEntityDonePage from '.';
+
+export default {
+  title: 'Components/Institutional/InstitutionalEntityDonePage',
+  component: InstitutionalEntityDonePage,
+  args: {
+    history: {
+      push: () => {
+        /**/
+      },
+    },
+    mostRecentOverviewPage: 'test',
+    location: {
+      state: {
+        imgSrc: './images/logo/metamask-fox.svg',
+        title: 'title',
+        description: 'description',
+      },
+    },
+  },
+};
+
+export const DefaultStory = (args) => <InstitutionalEntityDonePage {...args} />;
+
+DefaultStory.storyName = 'InstitutionalEntityDonePage';
diff --git a/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.test.js b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.test.js
new file mode 100644
index 000000000..0b9d77dd6
--- /dev/null
+++ b/ui/pages/institutional/institutional-entity-done-page/institutional-entity-done-page.test.js
@@ -0,0 +1,59 @@
+import React from 'react';
+import { fireEvent, screen } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import InstitutionalEntityDonePage from '.';
+
+const props = {
+  history: {
+    push: jest.fn(),
+  },
+  mostRecentOverviewPage: 'test',
+  location: {
+    state: { imgSrc: 'test', title: 'title', description: 'description' },
+  },
+};
+
+const render = () => {
+  const store = configureStore({
+    ...mockState,
+    metamask: {
+      provider: {
+        type: 'test',
+      },
+    },
+    history: {
+      mostRecentOverviewPage: 'test',
+    },
+  });
+
+  return renderWithProvider(<InstitutionalEntityDonePage {...props} />, store);
+};
+
+describe('InstitutionalEntityDonePage', () => {
+  beforeEach(() => {
+    render();
+  });
+
+  it('renders the component and shows the title', () => {
+    expect(screen.getByText(props.location.state.title)).toBeInTheDocument();
+  });
+
+  it('renders the component and shows the description', () => {
+    expect(
+      screen.getByText(props.location.state.description),
+    ).toBeInTheDocument();
+  });
+
+  it('renders the component and sets the image correctly', () => {
+    const image = screen.getByAltText('Entity image');
+    expect(image.src).toContain(props.location.state.imgSrc);
+  });
+
+  it('calls history push on button click', () => {
+    const clickButton = screen.getByTestId('click-most-recent-overview-page');
+    fireEvent.click(clickButton);
+    expect(props.history.push).toHaveBeenCalledTimes(1);
+  });
+});

From b5184db620c96db229f877b882dad4289584bb73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Oliv=C3=A9?= <albertolivecorbella@gmail.com>
Date: Thu, 30 Mar 2023 09:42:59 +0200
Subject: [PATCH 091/129] [MMI] Added code fencing in keyring-label component
 (#17993)

* Added code fencing in keyring-label component

* Updated tests
---
 .../__snapshots__/account-menu.test.js.snap   | 312 ++++++++++++++++++
 .../app/account-menu/account-menu.test.js     | 149 +++++----
 .../app/account-menu/keyring-label.js         |  14 +-
 3 files changed, 411 insertions(+), 64 deletions(-)
 create mode 100644 ui/components/app/account-menu/__snapshots__/account-menu.test.js.snap

diff --git a/ui/components/app/account-menu/__snapshots__/account-menu.test.js.snap b/ui/components/app/account-menu/__snapshots__/account-menu.test.js.snap
new file mode 100644
index 000000000..dae5ece45
--- /dev/null
+++ b/ui/components/app/account-menu/__snapshots__/account-menu.test.js.snap
@@ -0,0 +1,312 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Account Menu Render Content should not render keyring label if keyring tyoe is Custody - JSONRPC 1`] = `
+<div>
+  <div
+    class="account-menu"
+  >
+    <div
+      class="account-menu__close-area"
+    />
+    <div
+      class="account-menu__item account-menu__header"
+    >
+      My accounts
+      <button
+        class="button btn--rounded btn-secondary account-menu__lock-button"
+        role="button"
+        tabindex="0"
+      >
+        Lock
+      </button>
+    </div>
+    <div
+      class="account-menu__divider"
+    />
+    <div
+      class="account-menu__accounts-container"
+    >
+      <div
+        class="account-menu__accounts"
+      >
+        <button
+          class="account-menu__account account-menu__item--clickable"
+          data-testid="account-menu__account"
+        >
+          <div
+            class="account-menu__check-mark"
+          />
+          <div
+            class=""
+          >
+            <div
+              class="identicon"
+              style="height: 24px; width: 24px; border-radius: 12px;"
+            >
+              <div
+                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 24px; height: 24px; display: inline-block; background: rgb(24, 151, 242);"
+              >
+                <svg
+                  height="24"
+                  width="24"
+                  x="0"
+                  y="0"
+                >
+                  <rect
+                    fill="#2362E1"
+                    height="24"
+                    transform="translate(2.6919976385943882 -4.000732967425142) rotate(458.4 12 12)"
+                    width="24"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#F94301"
+                    height="24"
+                    transform="translate(-11.522594467237658 5.994263726614974) rotate(268.8 12 12)"
+                    width="24"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#FA7900"
+                    height="24"
+                    transform="translate(-6.8071905594760675 22.110011910512533) rotate(117.3 12 12)"
+                    width="24"
+                    x="0"
+                    y="0"
+                  />
+                </svg>
+              </div>
+            </div>
+          </div>
+          <div
+            class="account-menu__account-info"
+          >
+            <div
+              class="account-menu__name"
+            >
+              Account 1
+            </div>
+            <div
+              class="currency-display-component account-menu__balance"
+              data-testid="account-menu__balance"
+              title="0 ETH"
+            >
+              <span
+                class="currency-display-component__prefix"
+              />
+              <span
+                class="currency-display-component__text"
+              >
+                0
+              </span>
+              <span
+                class="currency-display-component__suffix"
+              >
+                ETH
+              </span>
+            </div>
+          </div>
+        </button>
+        <button
+          class="account-menu__account account-menu__item--clickable"
+          data-testid="account-menu__account"
+        >
+          <div
+            class="account-menu__check-mark"
+          />
+          <div
+            class=""
+          >
+            <div
+              class="identicon"
+              style="height: 24px; width: 24px; border-radius: 12px;"
+            >
+              <div
+                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 24px; height: 24px; display: inline-block; background: rgb(24, 162, 242);"
+              >
+                <svg
+                  height="24"
+                  width="24"
+                  x="0"
+                  y="0"
+                >
+                  <rect
+                    fill="#F29602"
+                    height="24"
+                    transform="translate(0.0008341139930255813 -0.00037625505634810975) rotate(358.8 12 12)"
+                    width="24"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#FA6C00"
+                    height="24"
+                    transform="translate(5.974289636227165 7.880005368393935) rotate(69.5 12 12)"
+                    width="24"
+                    x="0"
+                    y="0"
+                  />
+                  <rect
+                    fill="#236CE1"
+                    height="24"
+                    transform="translate(-14.300029938001572 12.149694281529626) rotate(260.2 12 12)"
+                    width="24"
+                    x="0"
+                    y="0"
+                  />
+                </svg>
+              </div>
+            </div>
+          </div>
+          <div
+            class="account-menu__account-info"
+          >
+            <div
+              class="account-menu__name"
+            >
+              Imported Account 1
+            </div>
+            <div
+              class="currency-display-component account-menu__balance"
+              data-testid="account-menu__balance"
+              title="0 ETH"
+            >
+              <span
+                class="currency-display-component__prefix"
+              />
+              <span
+                class="currency-display-component__text"
+              >
+                0
+              </span>
+              <span
+                class="currency-display-component__suffix"
+              >
+                ETH
+              </span>
+            </div>
+          </div>
+        </button>
+      </div>
+    </div>
+    <div
+      class="account-menu__divider"
+    />
+    <button
+      class="account-menu__item account-menu__item--clickable"
+    >
+      <div
+        class="account-menu__item__icon"
+      >
+        <span
+          class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-icon-alternative"
+          style="mask-image: url('./images/icons/add.svg');"
+        />
+      </div>
+      <div
+        class="account-menu__item__text"
+      >
+        Create account
+      </div>
+    </button>
+    <button
+      class="account-menu__item account-menu__item--clickable"
+    >
+      <div
+        class="account-menu__item__icon"
+      >
+        <span
+          class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-icon-alternative"
+          style="mask-image: url('./images/icons/import.svg');"
+        />
+      </div>
+      <div
+        class="account-menu__item__text"
+      >
+        Import account
+      </div>
+    </button>
+    <button
+      class="account-menu__item account-menu__item--clickable"
+    >
+      <div
+        class="account-menu__item__icon"
+      >
+        <span
+          class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-icon-alternative"
+          style="mask-image: url('./images/icons/hardware.svg');"
+        />
+      </div>
+      <div
+        class="account-menu__item__text"
+      >
+        Connect hardware wallet
+      </div>
+    </button>
+    <div
+      class="account-menu__divider"
+    />
+    <button
+      class="account-menu__item account-menu__item--clickable"
+    >
+      <div
+        class="account-menu__item__icon"
+      >
+        <div
+          class="account-menu__notifications"
+        >
+          <span
+            class="box mm-icon mm-icon--size-lg box--display-inline-block box--flex-direction-row box--color-inherit"
+            style="mask-image: url('./images/icons/notification.svg');"
+          />
+        </div>
+      </div>
+      <div
+        class="account-menu__item__text"
+      >
+        Notifications
+      </div>
+    </button>
+    <div
+      class="account-menu__divider"
+    />
+    <button
+      class="account-menu__item account-menu__item--clickable"
+    >
+      <div
+        class="account-menu__item__icon"
+      >
+        <span
+          class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-icon-alternative"
+          style="mask-image: url('./images/icons/messages.svg');"
+        />
+      </div>
+      <div
+        class="account-menu__item__text"
+      >
+        Submit a ticket
+      </div>
+    </button>
+    <button
+      class="account-menu__item account-menu__item--clickable"
+    >
+      <div
+        class="account-menu__item__icon"
+      >
+        <span
+          arialabel="Settings"
+          class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-icon-alternative"
+          style="mask-image: url('./images/icons/setting.svg');"
+        />
+      </div>
+      <div
+        class="account-menu__item__text"
+      >
+        Settings
+      </div>
+    </button>
+  </div>
+</div>
+`;
diff --git a/ui/components/app/account-menu/account-menu.test.js b/ui/components/app/account-menu/account-menu.test.js
index f7ded9a92..504631350 100644
--- a/ui/components/app/account-menu/account-menu.test.js
+++ b/ui/components/app/account-menu/account-menu.test.js
@@ -6,62 +6,63 @@ import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import { KeyringType } from '../../../../shared/constants/keyring';
 import AccountMenu from '.';
 
-describe('Account Menu', () => {
-  const mockStore = {
-    metamask: {
-      provider: {
-        type: 'test',
-      },
-      preferences: {
-        useNativeCurrencyAsPrimaryCurrency: true,
-      },
+const initialProps = {
+  isAccountMenuOpen: true,
+  addressConnectedSubjectMap: {},
+  accounts: [
+    {
+      address: '0x00',
+      name: 'Account 1',
+      balance: '0x0',
     },
-  };
+    {
+      address: '0x1',
+      name: 'Imported Account 1',
+      balance: '0x0',
+    },
+  ],
+  keyrings: [
+    {
+      type: KeyringType.hdKeyTree,
+      accounts: ['0xAdress'],
+    },
+    {
+      type: KeyringType.imported,
+      accounts: ['0x1'],
+    },
+  ],
+  prevIsAccountMenuOpen: false,
+  lockMetamask: sinon.spy(),
+  setSelectedAccount: sinon.spy(),
+  showRemoveAccountConfirmationModal: sinon.spy(),
+  toggleAccountMenu: sinon.spy(),
+  history: {
+    push: sinon.spy(),
+  },
+};
 
+const mockStore = {
+  metamask: {
+    provider: {
+      type: 'test',
+    },
+    preferences: {
+      useNativeCurrencyAsPrimaryCurrency: true,
+    },
+  },
+};
+
+const renderComponent = ({ props = initialProps } = {}) => {
   const store = configureMockStore()(mockStore);
+  return renderWithProvider(<AccountMenu.WrappedComponent {...props} />, store);
+};
 
-  const props = {
-    isAccountMenuOpen: true,
-    addressConnectedSubjectMap: {},
-    accounts: [
-      {
-        address: '0x00',
-        name: 'Account 1',
-        balance: '0x0',
-      },
-      {
-        address: '0x1',
-        name: 'Imported Account 1',
-        balance: '0x0',
-      },
-    ],
-    keyrings: [
-      {
-        type: KeyringType.hdKeyTree,
-        accounts: ['0xAdress'],
-      },
-      {
-        type: KeyringType.imported,
-        accounts: ['0x1'],
-      },
-    ],
-    prevIsAccountMenuOpen: false,
-    lockMetamask: sinon.spy(),
-    setSelectedAccount: sinon.spy(),
-    showRemoveAccountConfirmationModal: sinon.spy(),
-    toggleAccountMenu: sinon.spy(),
-    history: {
-      push: sinon.spy(),
-    },
-  };
-
-  beforeEach(() => {
-    renderWithProvider(<AccountMenu.WrappedComponent {...props} />, store);
-  });
+describe('Account Menu', () => {
+  beforeEach(() => renderComponent());
 
   afterEach(() => {
-    props.toggleAccountMenu.resetHistory();
-    props.history.push.resetHistory();
+    initialProps.toggleAccountMenu.resetHistory();
+    initialProps.history.push.resetHistory();
   });
 
   describe('Render Content', () => {
@@ -80,14 +81,36 @@ describe('Account Menu', () => {
       const click = screen.getAllByTestId('account-menu__account');
       fireEvent.click(click[0]);
 
-      expect(props.setSelectedAccount.calledOnce).toStrictEqual(true);
-      expect(props.setSelectedAccount.getCall(0).args[0]).toStrictEqual('0x00');
+      expect(initialProps.setSelectedAccount.calledOnce).toStrictEqual(true);
+      expect(initialProps.setSelectedAccount.getCall(0).args[0]).toStrictEqual(
+        '0x00',
+      );
     });
 
     it('render imported account label', () => {
       const importedAccount = screen.getByText('Imported');
       expect(importedAccount).toBeInTheDocument();
     });
+
+    it('should not render keyring label if keyring tyoe is Custody - JSONRPC', () => {
+      const props = {
+        ...initialProps,
+        keyrings: [
+          {
+            type: 'Custody - JSONRPC',
+            accounts: ['0xAdress'],
+          },
+          {
+            type: 'Custody - JSONRPC',
+            accounts: ['0x1'],
+          },
+        ],
+      };
+
+      const { container } = renderComponent({ props });
+
+      expect(container).toMatchSnapshot();
+    });
   });
 
   describe('Log Out', () => {
@@ -99,8 +122,8 @@ describe('Account Menu', () => {
     it('simulate click', () => {
       const logout = screen.getByText('Lock');
       fireEvent.click(logout);
-      expect(props.lockMetamask.calledOnce).toStrictEqual(true);
-      expect(props.history.push.getCall(0).args[0]).toStrictEqual('/');
+      expect(initialProps.lockMetamask.calledOnce).toStrictEqual(true);
+      expect(initialProps.history.push.getCall(0).args[0]).toStrictEqual('/');
     });
   });
 
@@ -113,8 +136,8 @@ describe('Account Menu', () => {
     it('calls toggle menu and push new-account route to history', () => {
       const createAccount = screen.getByText('Create account');
       fireEvent.click(createAccount);
-      expect(props.toggleAccountMenu.calledOnce).toStrictEqual(true);
-      expect(props.history.push.getCall(0).args[0]).toStrictEqual(
+      expect(initialProps.toggleAccountMenu.calledOnce).toStrictEqual(true);
+      expect(initialProps.history.push.getCall(0).args[0]).toStrictEqual(
         '/new-account',
       );
     });
@@ -129,8 +152,8 @@ describe('Account Menu', () => {
     it('calls toggle menu and push /new-account/import route to history', () => {
       const importAccount = screen.getByText('Import account');
       fireEvent.click(importAccount);
-      expect(props.toggleAccountMenu.calledOnce).toStrictEqual(true);
-      expect(props.history.push.getCall(0).args[0]).toStrictEqual(
+      expect(initialProps.toggleAccountMenu.calledOnce).toStrictEqual(true);
+      expect(initialProps.history.push.getCall(0).args[0]).toStrictEqual(
         '/new-account/import',
       );
     });
@@ -145,8 +168,8 @@ describe('Account Menu', () => {
     it('calls toggle menu and push /new-account/connect route to history', () => {
       const connectHardwareWallet = screen.getByText('Connect hardware wallet');
       fireEvent.click(connectHardwareWallet);
-      expect(props.toggleAccountMenu.calledOnce).toStrictEqual(true);
-      expect(props.history.push.getCall(0).args[0]).toStrictEqual(
+      expect(initialProps.toggleAccountMenu.calledOnce).toStrictEqual(true);
+      expect(initialProps.history.push.getCall(0).args[0]).toStrictEqual(
         '/new-account/connect',
       );
     });
@@ -176,8 +199,10 @@ describe('Account Menu', () => {
     it('calls toggle menu and push /new-account/connect route to history', () => {
       const settings = screen.getByText('Settings');
       fireEvent.click(settings);
-      expect(props.toggleAccountMenu.calledOnce).toStrictEqual(true);
-      expect(props.history.push.getCall(0).args[0]).toStrictEqual('/settings');
+      expect(initialProps.toggleAccountMenu.calledOnce).toStrictEqual(true);
+      expect(initialProps.history.push.getCall(0).args[0]).toStrictEqual(
+        '/settings',
+      );
     });
   });
 });
diff --git a/ui/components/app/account-menu/keyring-label.js b/ui/components/app/account-menu/keyring-label.js
index c4cf8b85c..ea406541f 100644
--- a/ui/components/app/account-menu/keyring-label.js
+++ b/ui/components/app/account-menu/keyring-label.js
@@ -7,7 +7,6 @@ import { KeyringType } from '../../../../shared/constants/keyring';
 
 export default function KeyRingLabel({ keyring }) {
   const t = useI18nContext();
-
   let label = null;
 
   // Keyring value might take a while to get a value
@@ -33,7 +32,18 @@ export default function KeyRingLabel({ keyring }) {
       label = HardwareKeyringNames.lattice;
       break;
     default:
-      return null;
+      label = null;
+  }
+
+  ///: BEGIN:ONLY_INCLUDE_IN(mmi)
+  if (type.startsWith('Custody') && /JSONRPC/u.test(type)) {
+    label = type.split(' - ')[1];
+    return null;
+  }
+  ///: END:ONLY_INCLUDE_IN
+
+  if (label === null) {
+    return label;
   }
 
   return (

From 9f89d71c6f71d93e63e4aedc7287ff73db351d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Thu, 30 Mar 2023 11:40:37 +0100
Subject: [PATCH 092/129] [MMI] compliance settings component (#18274)

* MMI-2657 adds the compliance settings screen

* MMI-2657 adds stories file

* review fixes

* review fixes

* lint fix

* clean up

* Update ui/components/institutional/compliance-settings/compliance-settings.stories.js

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

* lint fix

* snaps update

* Button update

---------

Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
---
 .../compliance-settings.test.js.snap          |  32 +++---
 .../compliance-settings.js                    | 102 ++++++++++--------
 .../compliance-settings.stories.js            |   7 +-
 .../compliance-settings/index.scss            |   8 --
 4 files changed, 75 insertions(+), 74 deletions(-)

diff --git a/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap b/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap
index 946a5a7f5..a8e345f24 100644
--- a/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap
+++ b/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap
@@ -5,31 +5,27 @@ exports[`Compliance Settings shows disconnect when Compliance is activated 1`] =
   <div
     class="box box--flex-direction-row"
   >
-    <div
-      class="box institutional-feature__content box--flex-direction-row"
+    <h6
+      class="box mm-text institutional-feature__content mm-text--body-sm box--flex-direction-row box--color-text-default"
     >
       Change your settings or view reports by opening up Codefi Compliance or disconnect below.
-    </div>
-    <footer
-      class="institutional-feature__footer"
+    </h6>
+    <div
+      class="box institutional-feature__footer box--padding-4 box--sm:padding-6 box--flex-direction-row box--border-style-solid box--border-color-border-muted box--border-width-1"
     >
       <button
-        class="button btn--rounded btn-default btn--large"
+        class="box mm-text mm-button-base mm-button-base--size-lg mm-button-primary mm-text--body-md box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-inverse box--background-color-primary-default box--rounded-pill"
         data-testid="disconnect-compliance"
-        role="button"
-        tabindex="0"
       >
         Disconnect
       </button>
       <button
-        class="button btn--rounded btn-primary"
+        class="box mm-text mm-button-base mm-button-base--size-lg mm-button-link mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
         data-testid="start-compliance"
-        role="button"
-        tabindex="0"
       >
         Open Codefi Compliance
       </button>
-    </footer>
+    </div>
   </div>
 </div>
 `;
@@ -42,6 +38,7 @@ exports[`Compliance Settings shows start btn when Compliance its not activated 1
   >
     <div
       class="box institutional-feature__content box--flex-direction-row"
+      variant="body-sm"
     >
       <p
         class="box mm-text mm-text--body-md box--padding-bottom-3 box--flex-direction-row box--color-text-default"
@@ -79,19 +76,16 @@ exports[`Compliance Settings shows start btn when Compliance its not activated 1
     <div
       class="box box--display-flex box--flex-direction-row box--justify-content-center"
     >
-      <footer
-        class="institutional-feature__footer"
-        padding="4,6"
+      <div
+        class="box institutional-feature__footer box--padding-4 box--sm:padding-6 box--flex-direction-row box--border-style-solid box--border-color-border-muted box--border-width-1"
       >
         <button
-          class="button btn--rounded btn-primary"
+          class="box mm-text mm-button-base mm-button-base--size-lg mm-button-link mm-text--body-md box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-default box--background-color-transparent"
           data-testid="start-compliance"
-          role="button"
-          tabindex="0"
         >
           Open Codefi Compliance
         </button>
-      </footer>
+      </div>
     </div>
   </div>
 </div>
diff --git a/ui/components/institutional/compliance-settings/compliance-settings.js b/ui/components/institutional/compliance-settings/compliance-settings.js
index aca08e198..4289250c8 100644
--- a/ui/components/institutional/compliance-settings/compliance-settings.js
+++ b/ui/components/institutional/compliance-settings/compliance-settings.js
@@ -5,12 +5,19 @@ import {
   DISPLAY,
   TextColor,
   FLEX_DIRECTION,
+  TextVariant,
+  BorderStyle,
+  BorderColor,
 } from '../../../helpers/constants/design-system';
 import { I18nContext } from '../../../contexts/i18n';
 import { mmiActionsFactory } from '../../../store/institutional/institution-background';
-import { Text } from '../../component-library';
+import {
+  Text,
+  Button,
+  BUTTON_TYPES,
+  BUTTON_SIZES,
+} from '../../component-library';
 import Box from '../../ui/box';
-import Button from '../../ui/button';
 
 const ComplianceSettings = () => {
   const t = useContext(I18nContext);
@@ -21,48 +28,48 @@ const ComplianceSettings = () => {
     Boolean(state.metamask.institutionalFeatures?.complianceProjectId),
   );
 
-  const disconnectFromCompliance = async () => {
-    await dispatch(mmiActions.deleteComplianceAuthData());
-  };
-
-  const renderDisconnect = () => {
-    return (
-      <Button
-        type="default"
-        large
-        onClick={disconnectFromCompliance}
-        data-testid="disconnect-compliance"
-      >
-        {t('disconnect')}
-      </Button>
-    );
-  };
-
-  const renderLinkButton = () => {
-    return (
-      <Button
-        type="primary"
-        data-testid="start-compliance"
-        onClick={() => {
-          global.platform.openTab({
-            url: 'https://start.compliance.codefi.network/',
-          });
-        }}
-      >
-        {t('openCodefiCompliance')}
-      </Button>
-    );
-  };
+  const linkButton = (
+    <Button
+      type={BUTTON_TYPES.LINK}
+      size={BUTTON_SIZES.LG}
+      data-testid="start-compliance"
+      onClick={() => {
+        global.platform.openTab({
+          url: 'https://start.compliance.codefi.network/',
+        });
+      }}
+    >
+      {t('openCodefiCompliance')}
+    </Button>
+  );
 
   return complianceActivated ? (
     <Box>
-      <Box className="institutional-feature__content">
+      <Text
+        variant={TextVariant.bodySm}
+        as="h6"
+        className="institutional-feature__content"
+      >
         {t('complianceSettingsExplanation')}
+      </Text>
+      <Box
+        padding={[4, 6]}
+        borderWidth={1}
+        borderStyle={BorderStyle.solid}
+        borderColor={BorderColor.borderMuted}
+        className="institutional-feature__footer"
+      >
+        <Button
+          size={BUTTON_SIZES.LG}
+          onClick={() => {
+            dispatch(mmiActions.deleteComplianceAuthData());
+          }}
+          data-testid="disconnect-compliance"
+        >
+          {t('disconnect')}
+        </Button>
+        {linkButton}
       </Box>
-      <footer className="institutional-feature__footer">
-        {renderDisconnect()}
-        {renderLinkButton()}
-      </footer>
     </Box>
   ) : (
     <Box
@@ -70,7 +77,10 @@ const ComplianceSettings = () => {
       color={TextColor.textAlternative}
       data-testid="institutional-content"
     >
-      <Box className="institutional-feature__content">
+      <Box
+        variant={TextVariant.bodySm}
+        className="institutional-feature__content"
+      >
         <Text paddingBottom={3}>{t('complianceBlurb0')}</Text>
         <Text paddingBottom={3}>{t('complianceBlurb1')}</Text>
         <Text paddingBottom={3}>{t('complianceBlurpStep0')}</Text>
@@ -87,9 +97,15 @@ const ComplianceSettings = () => {
         flexDirection={FLEX_DIRECTION.ROW}
         justifyContent={JustifyContent.center}
       >
-        <footer padding={[4, 6]} className="institutional-feature__footer">
-          {renderLinkButton()}
-        </footer>
+        <Box
+          padding={[4, 6]}
+          borderWidth={1}
+          borderStyle={BorderStyle.solid}
+          borderColor={BorderColor.borderMuted}
+          className="institutional-feature__footer"
+        >
+          {linkButton}
+        </Box>
       </Box>
     </Box>
   );
diff --git a/ui/components/institutional/compliance-settings/compliance-settings.stories.js b/ui/components/institutional/compliance-settings/compliance-settings.stories.js
index c3f73a8a3..cfcef8689 100644
--- a/ui/components/institutional/compliance-settings/compliance-settings.stories.js
+++ b/ui/components/institutional/compliance-settings/compliance-settings.stories.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { action } from '@storybook/addon-actions';
 import configureStore from '../../../store/store';
 import testData from '../../../../.storybook/test-data';
 import ComplianceSettings from '.';
@@ -23,9 +22,9 @@ export default {
   title: 'Components/Institutional/ComplianceSettings',
   decorators: [(story) => <Provider store={store}>{story()}</Provider>],
   component: ComplianceSettings,
-  args: {
-    onClick: () => {
-      action('onClick');
+  argTypes: {
+    onClick: {
+      action: 'onClick',
     },
   },
 };
diff --git a/ui/components/institutional/compliance-settings/index.scss b/ui/components/institutional/compliance-settings/index.scss
index df59c0c06..cb9c22a12 100644
--- a/ui/components/institutional/compliance-settings/index.scss
+++ b/ui/components/institutional/compliance-settings/index.scss
@@ -1,9 +1,5 @@
 .institutional-feature {
   &__footer {
-    border-top: 1px solid var(--color-text-muted);
-    padding: 16px 30px;
-    flex: 0 0 auto;
-
     button {
       min-width: 0;
       margin-right: 16px;
@@ -15,10 +11,6 @@
   }
 
   &__content {
-    @include H6;
-
-    line-height: 22px;
-
     ol {
       list-style: decimal;
       list-style-position: inside;

From da06901f790983109b3eab4f1ee1942cef731fe7 Mon Sep 17 00:00:00 2001
From: Alex Donesky <adonesky@gmail.com>
Date: Thu, 30 Mar 2023 11:37:29 -0500
Subject: [PATCH 093/129] Fix #18199 : Add fallbacks for confirmation title on
 NFT transfers (#18269)

* add fallbacks for confirmation title on nft transfers

* Add token name and id

* fix

* fix test

---------

Co-authored-by: David Walsh <davidwalsh83@gmail.com>
---
 .../confirm-subtitle/confirm-subtitle.test.js |  5 +-
 ui/hooks/useTransactionInfo.js                |  9 ++-
 ui/hooks/useTransactionInfo.test.js           |  5 +-
 .../confirm-token-transaction-base.js         | 76 +++++++++++++++++--
 4 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/ui/components/app/confirm-subtitle/confirm-subtitle.test.js b/ui/components/app/confirm-subtitle/confirm-subtitle.test.js
index ac2662a39..41cdc3da4 100644
--- a/ui/components/app/confirm-subtitle/confirm-subtitle.test.js
+++ b/ui/components/app/confirm-subtitle/confirm-subtitle.test.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { hexToDecimal } from '../../../../shared/modules/conversion.utils';
 
 import mockState from '../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
@@ -45,7 +46,9 @@ describe('ConfirmSubTitle', () => {
     mockState.metamask.preferences.showFiatInTestnets = false;
     mockState.metamask.allNftContracts = {
       [mockState.metamask.selectedAddress]: {
-        [mockState.metamask.provider.chainId]: [{ address: '0x9' }],
+        [hexToDecimal(mockState.metamask.provider.chainId)]: [
+          { address: '0x9' },
+        ],
       },
     };
     store = configureStore(mockState);
diff --git a/ui/hooks/useTransactionInfo.js b/ui/hooks/useTransactionInfo.js
index 245a24734..8312fe1bf 100644
--- a/ui/hooks/useTransactionInfo.js
+++ b/ui/hooks/useTransactionInfo.js
@@ -1,4 +1,5 @@
 import { useSelector } from 'react-redux';
+import { hexToDecimal } from '../../shared/modules/conversion.utils';
 
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
 
@@ -10,9 +11,11 @@ export const useTransactionInfo = (txData = {}) => {
   } = useSelector((state) => state.metamask);
 
   const isNftTransfer = Boolean(
-    allNftContracts?.[selectedAddress]?.[chainId]?.find((contract) => {
-      return isEqualCaseInsensitive(contract.address, txData.txParams.to);
-    }),
+    allNftContracts?.[selectedAddress]?.[hexToDecimal(chainId)]?.find(
+      (contract) => {
+        return isEqualCaseInsensitive(contract.address, txData.txParams.to);
+      },
+    ),
   );
 
   return { isNftTransfer };
diff --git a/ui/hooks/useTransactionInfo.test.js b/ui/hooks/useTransactionInfo.test.js
index e7fa5f40a..9858185ed 100644
--- a/ui/hooks/useTransactionInfo.test.js
+++ b/ui/hooks/useTransactionInfo.test.js
@@ -1,4 +1,5 @@
 import { renderHookWithProvider } from '../../test/lib/render-helpers';
+import { hexToDecimal } from '../../shared/modules/conversion.utils';
 import mockState from '../../test/data/mock-state.json';
 import { useTransactionInfo } from './useTransactionInfo';
 
@@ -17,7 +18,9 @@ describe('useTransactionInfo', () => {
     it('should return true if transaction is NFT transfer', () => {
       mockState.metamask.allNftContracts = {
         [mockState.metamask.selectedAddress]: {
-          [mockState.metamask.provider.chainId]: [{ address: '0x9' }],
+          [hexToDecimal(mockState.metamask.provider.chainId)]: [
+            { address: '0x9' },
+          ],
         },
       };
 
diff --git a/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js b/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js
index e81b5e061..e7f53a4db 100644
--- a/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js
+++ b/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js
@@ -2,6 +2,7 @@ import React, { useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import BigNumber from 'bignumber.js';
 import { useSelector } from 'react-redux';
+import { getTokenTrackerLink } from '@metamask/etherscan-link';
 import { I18nContext } from '../../contexts/i18n';
 import ConfirmTransactionBase from '../confirm-transaction-base';
 import UserPreferencedCurrencyDisplay from '../../components/app/user-preferenced-currency-display';
@@ -14,11 +15,15 @@ import {
 import { PRIMARY } from '../../helpers/constants/common';
 import {
   contractExchangeRateSelector,
+  getCurrentChainId,
   getCurrentCurrency,
+  getRpcPrefsForCurrentProvider,
+  getSelectedAddress,
 } from '../../selectors';
 import {
   getConversionRate,
   getNativeCurrency,
+  getNftContracts,
 } from '../../ducks/metamask/metamask';
 import { TokenStandard } from '../../../shared/constants/transaction';
 import {
@@ -26,6 +31,7 @@ import {
   hexWEIToDecETH,
 } from '../../../shared/modules/conversion.utils';
 import { EtherDenomination } from '../../../shared/constants/common';
+import { CHAIN_IDS, TEST_CHAINS } from '../../../shared/constants/network';
 
 export default function ConfirmTokenTransactionBase({
   image = '',
@@ -46,18 +52,78 @@ export default function ConfirmTokenTransactionBase({
   const nativeCurrency = useSelector(getNativeCurrency);
   const currentCurrency = useSelector(getCurrentCurrency);
   const conversionRate = useSelector(getConversionRate);
+  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
+  const chainId = useSelector(getCurrentChainId);
+  const userAddress = useSelector(getSelectedAddress);
+  const nftCollections = useSelector(getNftContracts);
 
   const ethTransactionTotalMaxAmount = Number(
     hexWEIToDecETH(hexMaximumTransactionFee),
   );
 
-  let title, subtitle;
+  const getTitleTokenDescription = (renderType) => {
+    const useBlockExplorer =
+      rpcPrefs?.blockExplorerUrl ||
+      [...TEST_CHAINS, CHAIN_IDS.MAINNET].includes(chainId);
+
+    const nftCollection = nftCollections.find(
+      (collection) =>
+        collection.address.toLowerCase() === tokenAddress.toLowerCase(),
+    );
+    const titleTokenDescription =
+      tokenSymbol || nftCollection?.name || t('unknownCollection');
+
+    if (renderType === 'text') {
+      return titleTokenDescription;
+    }
+
+    if (useBlockExplorer) {
+      const blockExplorerLink = getTokenTrackerLink(
+        tokenAddress,
+        chainId,
+        null,
+        userAddress,
+        {
+          blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+        },
+      );
+      const blockExplorerElement = (
+        <>
+          <a
+            href={blockExplorerLink}
+            target="_blank"
+            rel="noopener noreferrer"
+            title={tokenAddress}
+            className="confirm-approve-content__approval-asset-link"
+          >
+            {titleTokenDescription}
+          </a>
+        </>
+      );
+      return blockExplorerElement;
+    }
+    return (
+      <>
+        <span
+          className="confirm-approve-content__approval-asset-title"
+          title={tokenAddress}
+        >
+          {titleTokenDescription}
+        </span>
+      </>
+    );
+  };
+
+  const assetImage = image;
+  let title, subtitle, subtotalDisplay;
   if (
     assetStandard === TokenStandard.ERC721 ||
     assetStandard === TokenStandard.ERC1155
   ) {
-    title = assetName;
+    title = assetName || getTitleTokenDescription();
     subtitle = `#${tokenId}`;
+    subtotalDisplay =
+      assetName || `${getTitleTokenDescription('text')} #${tokenId}`;
   } else if (assetStandard === TokenStandard.ERC20) {
     title = `${tokenAmount} ${tokenSymbol}`;
   }
@@ -122,13 +188,13 @@ export default function ConfirmTokenTransactionBase({
   return (
     <ConfirmTransactionBase
       toAddress={toAddress}
-      image={image}
+      image={assetImage}
       onEdit={onEdit}
       tokenAddress={tokenAddress}
       title={title}
       subtitleComponent={subtitleComponent()}
-      primaryTotalTextOverride={`${title} + ${ethTransactionTotal} ${nativeCurrency}`}
-      primaryTotalTextOverrideMaxAmount={`${title} + ${ethTransactionTotalMaxAmount} ${nativeCurrency}`}
+      primaryTotalTextOverride={`${subtotalDisplay} + ${ethTransactionTotal} ${nativeCurrency}`}
+      primaryTotalTextOverrideMaxAmount={`${subtotalDisplay} + ${ethTransactionTotalMaxAmount} ${nativeCurrency}`}
       secondaryTotalTextOverride={secondaryTotalTextOverride}
     />
   );

From 05f0006684df0741a13b0fc1ae795e981bbe6ec6 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 30 Mar 2023 18:33:42 +0100
Subject: [PATCH 094/129] Fix aria label error on the console (#18370)

* fix aria label bug

* improve solution

* improve solution

* improve solution

* update snapshot
---
 .../__snapshots__/account-menu.test.js.snap   |  2 +-
 ui/components/ui/box/box.js                   | 23 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ui/components/app/account-menu/__snapshots__/account-menu.test.js.snap b/ui/components/app/account-menu/__snapshots__/account-menu.test.js.snap
index dae5ece45..f7604d462 100644
--- a/ui/components/app/account-menu/__snapshots__/account-menu.test.js.snap
+++ b/ui/components/app/account-menu/__snapshots__/account-menu.test.js.snap
@@ -296,7 +296,7 @@ exports[`Account Menu Render Content should not render keyring label if keyring
         class="account-menu__item__icon"
       >
         <span
-          arialabel="Settings"
+          aria-label="Settings"
           class="box mm-icon mm-icon--size-md box--display-inline-block box--flex-direction-row box--color-icon-alternative"
           style="mask-image: url('./images/icons/setting.svg');"
         />
diff --git a/ui/components/ui/box/box.js b/ui/components/ui/box/box.js
index d0c5834fc..0e381334c 100644
--- a/ui/components/ui/box/box.js
+++ b/ui/components/ui/box/box.js
@@ -222,6 +222,7 @@ const Box = React.forwardRef(function Box(
     className,
     backgroundColor,
     color,
+    ariaLabel,
     as = 'div',
     ...props
   },
@@ -300,13 +301,31 @@ const Box = React.forwardRef(function Box(
     return children(boxClassName);
   }
   const Component = as;
+
+  const ariaLabelProp = {};
+  if (isCustomComponent(Component)) {
+    ariaLabelProp.ariaLabel = ariaLabel;
+  } else {
+    ariaLabelProp['aria-label'] = ariaLabel;
+  }
+
+  if (props['aria-label']) {
+    ariaLabelProp['aria-label'] = props['aria-label'];
+  }
+
   return (
-    <Component className={boxClassName} ref={ref} {...props}>
+    <Component className={boxClassName} ref={ref} {...props} {...ariaLabelProp}>
       {children}
     </Component>
   );
 });
 
+// Both class or functional components have type function.
+// Built-in HTML elements (div, span, etc.) have type string.
+function isCustomComponent(element) {
+  return typeof element.type === 'function';
+}
+
 Box.propTypes = {
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
   flexDirection: PropTypes.oneOfType([
@@ -372,6 +391,8 @@ Box.propTypes = {
    * ./ui/helpers/constants/design-system.js
    */
   color: MultipleTextColors,
+  ariaLabel: PropTypes.string,
+  'aria-label': PropTypes.string,
 };
 
 export default Box;

From ba307d72582193e5f9e82c3cfb84f284653b5091 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Thu, 30 Mar 2023 13:11:13 -0500
Subject: [PATCH 095/129] UX: Multichain: Account Picker (#18177)

* UX: Multichain: Account Picker

* Update ui/components/multichain/account-picker/index.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Update ui/components/multichain/account-picker/index.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Update ui/components/multichain/account-picker/index.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Update ui/components/multichain/account-picker/index.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Cleanup

* Move file names to DS standard

* Add index for export

* Add MULTICHAIN flag

* Fix hover color

* Fix lint

* Use BackgroundColor instead of Color

* Add comments for propTypes

* Provide args properly

* Implement onClick arg

* Fix alignment

* Update ui/components/multichain/account-picker/account-picker.js

* Update ui/components/multichain/account-picker/account-picker.js

* Update ui/components/multichain/account-picker/account-picker.js

* Update ui/components/multichain/account-picker/account-picker.js

* Update ui/components/multichain/account-picker/account-picker.js

* Only use account name and address, account for blockies or jazzicons

* Add test

* Fix jest change

* Fix CSS locations

* Update ui/components/multichain/account-picker/account-picker.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Update ui/components/multichain/account-picker/account-picker.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Update ui/components/multichain/account-picker/account-picker.js

Co-authored-by: Garrett Bear <gwhisten@gmail.com>

* Update snapshot

* Update border radius

* Fix jest

* Switch to using Button

---------

Co-authored-by: Garrett Bear <gwhisten@gmail.com>
---
 .../__snapshots__/account-picker.test.js.snap | 39 ++++++++++
 .../account-picker/account-picker.js          | 72 +++++++++++++++++++
 .../account-picker/account-picker.stories.js  | 41 +++++++++++
 .../account-picker/account-picker.test.js     | 47 ++++++++++++
 .../multichain/account-picker/index.js        |  1 +
 .../multichain/account-picker/index.scss      |  7 ++
 ui/components/multichain/index.js             |  1 +
 .../multichain/multichain-components.scss     |  1 +
 8 files changed, 209 insertions(+)
 create mode 100644 ui/components/multichain/account-picker/__snapshots__/account-picker.test.js.snap
 create mode 100644 ui/components/multichain/account-picker/account-picker.js
 create mode 100644 ui/components/multichain/account-picker/account-picker.stories.js
 create mode 100644 ui/components/multichain/account-picker/account-picker.test.js
 create mode 100644 ui/components/multichain/account-picker/index.js
 create mode 100644 ui/components/multichain/account-picker/index.scss

diff --git a/ui/components/multichain/account-picker/__snapshots__/account-picker.test.js.snap b/ui/components/multichain/account-picker/__snapshots__/account-picker.test.js.snap
new file mode 100644
index 000000000..35458afd1
--- /dev/null
+++ b/ui/components/multichain/account-picker/__snapshots__/account-picker.test.js.snap
@@ -0,0 +1,39 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountPicker renders properly 1`] = `
+<div>
+  <button
+    class="box mm-text mm-button-base mm-button-base--size-md mm-button-base--ellipsis multichain-account-picker mm-button-primary mm-text--body-md mm-text--ellipsis box--padding-right-4 box--padding-left-4 box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-primary-inverse box--background-color-transparent box--rounded-lg"
+  >
+    <span
+      class="box mm-text mm-text--inherit mm-text--ellipsis box--display-flex box--gap-2 box--flex-direction-row box--align-items-center box--color-primary-inverse"
+    >
+      <div
+        class="box mm-text mm-avatar-base mm-avatar-base--size-sm mm-avatar-account mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-border-default box--border-style-solid box--border-width-1"
+      >
+        <canvas
+          height="32"
+          style="display: none;"
+          width="32"
+        />
+        <img
+          alt=""
+          height="24"
+          src="data:image/png;base64,00"
+          style="border-radius: 50%;"
+          width="24"
+        />
+      </div>
+      <span
+        class="box mm-text mm-text--body-md mm-text--font-weight-bold mm-text--ellipsis box--flex-direction-row box--color-text-default"
+      >
+        Account 1
+      </span>
+      <span
+        class="box mm-icon mm-icon--size-sm box--display-inline-block box--flex-direction-row box--color-icon-default"
+        style="mask-image: url('./images/icons/arrow-down.svg');"
+      />
+    </span>
+  </button>
+</div>
+`;
diff --git a/ui/components/multichain/account-picker/account-picker.js b/ui/components/multichain/account-picker/account-picker.js
new file mode 100644
index 000000000..a1e95438c
--- /dev/null
+++ b/ui/components/multichain/account-picker/account-picker.js
@@ -0,0 +1,72 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+import {
+  Button,
+  ICON_NAMES,
+  AvatarAccount,
+  AvatarAccountVariant,
+  Text,
+  Icon,
+} from '../../component-library';
+import {
+  AlignItems,
+  BackgroundColor,
+  BorderRadius,
+  DISPLAY,
+  FONT_WEIGHT,
+  IconColor,
+  Size,
+} from '../../../helpers/constants/design-system';
+
+export const AccountPicker = ({ address, name, onClick }) => {
+  const useBlockie = useSelector((state) => state.metamask.useBlockie);
+
+  return (
+    <Button
+      className="multichain-account-picker"
+      onClick={onClick}
+      backgroundColor={BackgroundColor.transparent}
+      borderRadius={BorderRadius.LG}
+      ellipsis
+      textProps={{
+        display: DISPLAY.FLEX,
+        gap: 2,
+        alignItems: AlignItems.center,
+      }}
+    >
+      <AvatarAccount
+        variant={
+          useBlockie
+            ? AvatarAccountVariant.Blockies
+            : AvatarAccountVariant.Jazzicon
+        }
+        address={address}
+        size={Size.SM}
+      />
+      <Text as="span" fontWeight={FONT_WEIGHT.BOLD} ellipsis>
+        {name}
+      </Text>
+      <Icon
+        name={ICON_NAMES.ARROW_DOWN}
+        color={IconColor.iconDefault}
+        size={Size.SM}
+      />
+    </Button>
+  );
+};
+
+AccountPicker.propTypes = {
+  /**
+   * Account name
+   */
+  name: PropTypes.string.isRequired,
+  /**
+   * Account address, used for blockie or jazzicon
+   */
+  address: PropTypes.string.isRequired,
+  /**
+   * Action to perform when the account picker is clicked
+   */
+  onClick: PropTypes.func.isRequired,
+};
diff --git a/ui/components/multichain/account-picker/account-picker.stories.js b/ui/components/multichain/account-picker/account-picker.stories.js
new file mode 100644
index 000000000..d82c2c490
--- /dev/null
+++ b/ui/components/multichain/account-picker/account-picker.stories.js
@@ -0,0 +1,41 @@
+import React from 'react';
+import { AccountPicker } from '.';
+
+const CHAOS_ACCOUNT = {
+  address: '"0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e"',
+  name: 'Account That Has A Really Really Really Really Really Long Name',
+};
+
+export default {
+  title: 'Components/Multichain/AccountPicker',
+  component: AccountPicker,
+  argTypes: {
+    name: {
+      control: 'string',
+    },
+    address: {
+      control: 'string',
+    },
+    onClick: {
+      action: 'onClick',
+    },
+  },
+  args: {
+    address: '"0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e"',
+    name: 'Account 1',
+    onClick: () => undefined,
+  },
+};
+
+export const DefaultStory = (args) => <AccountPicker {...args} />;
+DefaultStory.storyName = 'Default';
+
+export const ChaosStory = (args) => (
+  <div
+    style={{ maxWidth: '300px', border: '1px solid var(--color-border-muted)' }}
+  >
+    <AccountPicker {...args} />
+  </div>
+);
+ChaosStory.storyName = 'Chaos';
+ChaosStory.args = { name: CHAOS_ACCOUNT.name };
diff --git a/ui/components/multichain/account-picker/account-picker.test.js b/ui/components/multichain/account-picker/account-picker.test.js
new file mode 100644
index 000000000..b16bccd04
--- /dev/null
+++ b/ui/components/multichain/account-picker/account-picker.test.js
@@ -0,0 +1,47 @@
+/* eslint-disable jest/require-top-level-describe */
+import React from 'react';
+import 'jest-canvas-mock';
+import { renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import { AccountPicker } from '.';
+
+const DEFAULT_PROPS = {
+  name: 'Account 1',
+  address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+  onClick: () => undefined,
+};
+
+const render = (props = {}, state = {}) => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+      provider: {
+        chainId: '0x99',
+      },
+      ...state,
+    },
+  });
+  return renderWithProvider(
+    <AccountPicker {...DEFAULT_PROPS} {...props} />,
+    store,
+  );
+};
+
+describe('AccountPicker', () => {
+  it('renders properly', () => {
+    const { container } = render({}, { useBlockie: true });
+    expect(container).toMatchSnapshot();
+  });
+
+  it('displays a blockie per the setting', () => {
+    const { container } = render({}, { useBlockie: true });
+    expect(container.querySelector('canvas')).toBeDefined();
+    expect(container.querySelector('img')).toBeDefined();
+  });
+
+  it('displays a jazzicon per the setting', () => {
+    const { container } = render({}, { useBlockie: false });
+    expect(container.querySelector('svg')).toBeDefined();
+  });
+});
diff --git a/ui/components/multichain/account-picker/index.js b/ui/components/multichain/account-picker/index.js
new file mode 100644
index 000000000..e561ae61c
--- /dev/null
+++ b/ui/components/multichain/account-picker/index.js
@@ -0,0 +1 @@
+export { AccountPicker } from './account-picker';
diff --git a/ui/components/multichain/account-picker/index.scss b/ui/components/multichain/account-picker/index.scss
new file mode 100644
index 000000000..4640ac384
--- /dev/null
+++ b/ui/components/multichain/account-picker/index.scss
@@ -0,0 +1,7 @@
+.multichain-account-picker {
+  &:hover,
+  &:focus {
+    box-shadow: none;
+    background: var(--color-background-default-hover);
+  }
+}
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
index edf6785b9..b686c0948 100644
--- a/ui/components/multichain/index.js
+++ b/ui/components/multichain/index.js
@@ -1,6 +1,7 @@
 export { AccountListItem } from './account-list-item';
 export { AccountListItemMenu } from './account-list-item-menu';
 export { AccountListMenu } from './account-list-menu';
+export { AccountPicker } from './account-picker';
 export { DetectedTokensBanner } from './detected-token-banner';
 export { GlobalMenu } from './global-menu';
 export { MultichainImportTokenLink } from './multichain-import-token-link';
diff --git a/ui/components/multichain/multichain-components.scss b/ui/components/multichain/multichain-components.scss
index 8fe555f0b..a2a2dbd20 100644
--- a/ui/components/multichain/multichain-components.scss
+++ b/ui/components/multichain/multichain-components.scss
@@ -7,4 +7,5 @@
 @import 'address-copy-button/index';
 @import 'account-list-item/index';
 @import 'account-list-menu/index';
+@import 'account-picker/index';
 @import 'multichain-token-list-item/multichain-token-list-item';

From 6f7e382777ab9d237f9bfc21b39d0a12171a1cbb Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Thu, 30 Mar 2023 13:12:45 -0500
Subject: [PATCH 096/129] UX: Multichain: Improve accessibility of accounts
 menu (#18309)

* UX: Multichain: Improve accessibility of accounts menu

* Use button instead of a

* Pass color instead of using CSS
---
 .../account-list-item.test.js.snap            | 19 ++++++---
 .../account-list-item/account-list-item.js    | 41 +++++++++----------
 .../multichain/account-list-item/index.scss   |  8 ++++
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
index 59d42769f..a9e697276 100644
--- a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
+++ b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`AccountListItem renders AccountListItem component and shows account name, address, and balance 1`] = `
 <div>
-  <button
+  <div
     class="box multichain-account-list-item box--padding-4 box--display-flex box--gap-2 box--flex-direction-row box--background-color-transparent"
   >
     <div
@@ -60,7 +60,15 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
           <div
             class="box mm-text mm-text--body-md mm-text--ellipsis box--flex-direction-row box--color-text-default"
           >
-            Test Account
+            <button
+              class="box mm-text mm-button-base mm-button-base--ellipsis multichain-account-list-item__account-name mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--ellipsis box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-transparent"
+            >
+              <span
+                class="box mm-text mm-text--inherit mm-text--ellipsis box--flex-direction-row box--color-text-default"
+              >
+                Test Account
+              </span>
+            </button>
           </div>
           <div
             class="box box--display-flex box--flex-direction-row box--align-items-center"
@@ -123,18 +131,17 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
       </div>
     </div>
     <div>
-      <div
+      <button
         aria-label="Test Account Options"
         class="box mm-button-icon mm-button-icon--size-sm box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-icon-default box--background-color-transparent box--rounded-lg"
         data-testid="account-list-item-menu-button"
-        tabindex="0"
       >
         <span
           class="box mm-icon mm-icon--size-sm box--display-inline-block box--flex-direction-row box--color-inherit"
           style="mask-image: url('./images/icons/more-vertical.svg');"
         />
-      </div>
+      </button>
     </div>
-  </button>
+  </div>
 </div>
 `;
diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js
index bbfd277a4..59e74a38e 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -17,6 +17,7 @@ import {
   ICON_SIZES,
   AvatarFavicon,
   Tag,
+  ButtonLink,
 } from '../../component-library';
 import {
   Color,
@@ -87,9 +88,7 @@ export const AccountListItem = ({
       className={classnames('multichain-account-list-item', {
         'multichain-account-list-item--selected': selected,
       })}
-      as="button"
-      onClick={(e) => {
-        e.preventDefault();
+      onClick={() => {
         // Without this check, the account will be selected after
         // the account options menu closes
         if (!accountOptionsMenuOpen) {
@@ -121,17 +120,24 @@ export const AccountListItem = ({
             gap={2}
           >
             <Text ellipsis as="div">
-              {identity.name.length > MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP ? (
-                <Tooltip
-                  title={identity.name}
-                  position="bottom"
-                  wrapperClassName="multichain-account-list-item__tooltip"
-                >
-                  {identity.name}
-                </Tooltip>
-              ) : (
-                identity.name
-              )}
+              <ButtonLink
+                onClick={onClick}
+                className="multichain-account-list-item__account-name"
+                color={Color.textDefault}
+                ellipsis
+              >
+                {identity.name.length > MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP ? (
+                  <Tooltip
+                    title={identity.name}
+                    position="bottom"
+                    wrapperClassName="multichain-account-list-item__tooltip"
+                  >
+                    {identity.name}
+                  </Tooltip>
+                ) : (
+                  identity.name
+                )}
+              </ButtonLink>
             </Text>
             <Box
               display={DISPLAY.FLEX}
@@ -195,13 +201,6 @@ export const AccountListItem = ({
             e.stopPropagation();
             setAccountOptionsMenuOpen(true);
           }}
-          as="div"
-          tabIndex={0}
-          onKeyPress={(e) => {
-            if (e.key === 'Enter') {
-              setAccountOptionsMenuOpen(true);
-            }
-          }}
           data-testid="account-list-item-menu-button"
         />
         {accountOptionsMenuOpen ? (
diff --git a/ui/components/multichain/account-list-item/index.scss b/ui/components/multichain/account-list-item/index.scss
index 5d74ee152..69a6f9fc5 100644
--- a/ui/components/multichain/account-list-item/index.scss
+++ b/ui/components/multichain/account-list-item/index.scss
@@ -1,6 +1,7 @@
 .multichain-account-list-item {
   position: relative;
   width: 100%;
+  cursor: pointer;
 
   &:not(.account-list-item--selected) {
     &:hover,
@@ -9,6 +10,13 @@
     }
   }
 
+  &__account-name {
+    &:hover,
+    &:focus {
+      opacity: 1;
+    }
+  }
+
   &__selected-indicator {
     width: 4px;
     height: calc(100% - 8px);

From b3e45ea4bc8c8b08531f41a37c49ac3bdb447924 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 30 Mar 2023 22:25:02 +0400
Subject: [PATCH 097/129] Adding terms of use link for opensea (#18381)

---
 app/_locales/de/messages.json                      |  3 ---
 app/_locales/el/messages.json                      |  3 ---
 app/_locales/en/messages.json                      |  6 +++++-
 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 ---
 .../__snapshots__/experimental-tab.test.js.snap    | 14 +++++++++++++-
 .../experimental-tab/experimental-tab.component.js | 11 ++++++++++-
 17 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 125c3b7de..ad9d680ae 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Dies basiert auf Informationen von "
   },
-  "thisServiceIsExperimental": {
-    "message": "Dieser Dienst ist experimentell"
-  },
   "time": {
     "message": "Zeit"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index c546cc525..6817c89bf 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Αυτό βασίζεται σε πληροφορίες από"
   },
-  "thisServiceIsExperimental": {
-    "message": "Η υπηρεσία αυτή είναι πειραματική"
-  },
   "time": {
     "message": "Ώρα"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 17a25f726..82873ab64 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -4236,6 +4236,9 @@
   "termsOfService": {
     "message": "Terms of service"
   },
+  "termsOfUse": {
+    "message": "terms of use"
+  },
   "testNetworks": {
     "message": "Test networks"
   },
@@ -4255,7 +4258,8 @@
     "message": "This is based on information from "
   },
   "thisServiceIsExperimental": {
-    "message": "This service is experimental"
+    "message": "This service is experimental. By enabling this feature, you agree to OpenSea's $1.",
+    "description": "$1 is link to open sea terms of use"
   },
   "time": {
     "message": "Time"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 97a44bba6..5b580280b 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Esto se basa en información de "
   },
-  "thisServiceIsExperimental": {
-    "message": "Este servicio es experimental"
-  },
   "time": {
     "message": "Tiempo"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 97de591eb..cd3384918 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Ces informations proviennent de "
   },
-  "thisServiceIsExperimental": {
-    "message": "Ce service est expérimental"
-  },
   "time": {
     "message": "Temps"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 5b7fe87f5..c6a645cb0 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "से प्राप्त जानकारी पर आधारित है"
   },
-  "thisServiceIsExperimental": {
-    "message": "यह सेवा प्रयोगात्मक है"
-  },
   "time": {
     "message": "समय"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index f9e095eb2..b1b6f1b04 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Hal ini berdasarkan informasi dari "
   },
-  "thisServiceIsExperimental": {
-    "message": "Layanan ini bersifat eksperimental"
-  },
   "time": {
     "message": "Waktu"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 8ad925bfa..2c01188de 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "これは次の情報源からの情報に基づくものです: "
   },
-  "thisServiceIsExperimental": {
-    "message": "このサービスは実験段階です"
-  },
   "time": {
     "message": "時間"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 08e8f864e..7fb0bc692 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "다음에 기반한 정보입니다: "
   },
-  "thisServiceIsExperimental": {
-    "message": "이 서비스는 시험 서비스입니다"
-  },
   "time": {
     "message": "시간"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 8da0e5df6..456fde9d4 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Isso se baseia em informações de "
   },
-  "thisServiceIsExperimental": {
-    "message": "Esse serviço é experimental"
-  },
   "time": {
     "message": "Hora"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index d9ca24758..16f65a155 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Это основано на информации от "
   },
-  "thisServiceIsExperimental": {
-    "message": "Этот сервис является экспериментальным"
-  },
   "time": {
     "message": "Время"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 10886a0cc..80f823d84 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Ito ay batay sa impormasyon mula sa "
   },
-  "thisServiceIsExperimental": {
-    "message": "Eksperimental ang serbisyong ito"
-  },
   "time": {
     "message": "Oras"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index cf3cb89ce..61da04252 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Bu, şu kaynaktan alınan bilgilere dayanır: "
   },
-  "thisServiceIsExperimental": {
-    "message": "Bu hizmet deneyseldir"
-  },
   "time": {
     "message": "Zaman"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 05ccf3799..97eccee87 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "Điều này dựa trên thông tin từ "
   },
-  "thisServiceIsExperimental": {
-    "message": "Đây là dịch vụ thử nghiệm"
-  },
   "time": {
     "message": "Thời gian"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 702241f88..d000e0c6b 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -4000,9 +4000,6 @@
   "thisIsBasedOn": {
     "message": "所根据的信息是来自"
   },
-  "thisServiceIsExperimental": {
-    "message": "此服务是实验性的"
-  },
   "time": {
     "message": "时间"
   },
diff --git a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap
index afdb27a43..940e72647 100644
--- a/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap
+++ b/ui/pages/settings/experimental-tab/__snapshots__/experimental-tab.test.js.snap
@@ -85,7 +85,19 @@ exports[`ExperimentalTab with desktop enabled renders ExperimentalTab component
           <h6
             class="box box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
           >
-            This service is experimental
+            <span>
+               
+              This service is experimental. By enabling this feature, you agree to OpenSea's 
+              <a
+                href="http://opensea.io/securityproviderterms"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                terms of use
+              </a>
+              .
+               
+            </span>
           </h6>
           <h5
             class="box box--margin-top-2 box--margin-bottom-1 box--flex-direction-row typography typography--h5 typography--weight-medium typography--style-normal typography--color-text-muted"
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js
index 5b1c3c1a8..5039af938 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.component.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js
@@ -209,7 +209,16 @@ export default class ExperimentalTab extends PureComponent {
                 color={TextColor.textAlternative}
                 marginTop={0}
               >
-                {t('thisServiceIsExperimental')}
+                {t('thisServiceIsExperimental', [
+                  <a
+                    href="http://opensea.io/securityproviderterms"
+                    key="termsOfUse"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    {t('termsOfUse')}
+                  </a>,
+                ])}
               </Typography>
               <Typography
                 variant={TypographyVariant.H5}

From 9b0a6ecc90abc1fc024176becc7f7ee6db59e623 Mon Sep 17 00:00:00 2001
From: Elliot Winkler <elliot.winkler@gmail.com>
Date: Thu, 30 Mar 2023 12:39:36 -0600
Subject: [PATCH 098/129] NetworkController: Use messenger for events (#18041)

Currently, the network controller notifies consumers about events by
emitting them directly from the controller. In order to migrate the
controller to the core repo, where controllers use the BaseControllerV2
interface, events should be emitted via a messenger object.

This commit updates the network controller to use a messenger, and then
updates all of the controllers that listen for network events to use the
messenger as well.
---
 app/scripts/controllers/detect-tokens.test.js |  35 +-
 app/scripts/controllers/metametrics.test.js   |  13 +-
 app/scripts/controllers/network/index.js      |   2 +-
 .../controllers/network/network-controller.js |  81 ++-
 .../network/network-controller.test.js        | 495 ++++++++++++------
 app/scripts/controllers/preferences.js        |   9 +-
 app/scripts/controllers/preferences.test.js   |   4 +
 app/scripts/controllers/swaps.js              |   4 +-
 app/scripts/controllers/swaps.test.js         |  24 +-
 app/scripts/metamask-controller.js            |  94 ++--
 10 files changed, 508 insertions(+), 253 deletions(-)

diff --git a/app/scripts/controllers/detect-tokens.test.js b/app/scripts/controllers/detect-tokens.test.js
index 8a3685f22..cd8040a68 100644
--- a/app/scripts/controllers/detect-tokens.test.js
+++ b/app/scripts/controllers/detect-tokens.test.js
@@ -13,7 +13,7 @@ import { convertHexToDecimal } from '@metamask/controller-utils';
 import { NETWORK_TYPES } from '../../../shared/constants/network';
 import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
 import DetectTokensController from './detect-tokens';
-import NetworkController, { NETWORK_EVENTS } from './network';
+import NetworkController, { NetworkControllerEventTypes } from './network';
 import PreferencesController from './preferences';
 
 describe('DetectTokensController', function () {
@@ -34,7 +34,11 @@ describe('DetectTokensController', function () {
 
   beforeEach(async function () {
     keyringMemStore = new ObservableStore({ isUnlocked: false });
-    network = new NetworkController({ infuraProjectId: 'foo' });
+    const networkControllerMessenger = new ControllerMessenger();
+    network = new NetworkController({
+      messenger: networkControllerMessenger,
+      infuraProjectId: 'foo',
+    });
     network.initializeProvider(networkControllerProviderConfig);
     provider = network.getProviderAndBlockTracker().provider;
 
@@ -54,6 +58,8 @@ describe('DetectTokensController', function () {
       network,
       provider,
       tokenListController,
+      onInfuraIsBlocked: sinon.stub(),
+      onInfuraIsUnblocked: sinon.stub(),
     });
     preferences.setAddresses([
       '0x7e57e2',
@@ -82,17 +88,20 @@ describe('DetectTokensController', function () {
         preferences.store,
       ),
       onNetworkStateChange: (cb) =>
-        network.on(NETWORK_EVENTS.NETWORK_DID_CHANGE, () => {
-          const networkState = network.store.getState();
-          const modifiedNetworkState = {
-            ...networkState,
-            providerConfig: {
-              ...networkState.provider,
-              chainId: convertHexToDecimal(networkState.provider.chainId),
-            },
-          };
-          return cb(modifiedNetworkState);
-        }),
+        networkControllerMessenger.subscribe(
+          NetworkControllerEventTypes.NetworkDidChange,
+          () => {
+            const networkState = network.store.getState();
+            const modifiedNetworkState = {
+              ...networkState,
+              providerConfig: {
+                ...networkState.provider,
+                chainId: convertHexToDecimal(networkState.provider.chainId),
+              },
+            };
+            return cb(modifiedNetworkState);
+          },
+        ),
     });
 
     sandbox
diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js
index f3969a7b3..18535c1d7 100644
--- a/app/scripts/controllers/metametrics.test.js
+++ b/app/scripts/controllers/metametrics.test.js
@@ -15,7 +15,6 @@ import {
 } from '../../../shared/constants/network';
 import * as Utils from '../lib/util';
 import MetaMetricsController from './metametrics';
-import { NETWORK_EVENTS } from './network';
 
 const segment = createSegmentMock(2, 10000);
 
@@ -72,17 +71,17 @@ function getMockNetworkController() {
     },
     network: 'loading',
   };
-  const on = sinon.stub().withArgs(NETWORK_EVENTS.NETWORK_DID_CHANGE);
+  const onNetworkDidChange = sinon.stub();
   const updateState = (newState) => {
     state = { ...state, ...newState };
-    on.getCall(0).args[1]();
+    onNetworkDidChange.getCall(0).args[0]();
   };
   return {
     store: {
       getState: () => state,
       updateState,
     },
-    on,
+    onNetworkDidChange,
   };
 }
 
@@ -136,10 +135,8 @@ function getMetaMetricsController({
     segment: segmentInstance || segment,
     getCurrentChainId: () =>
       networkController.store.getState().provider.chainId,
-    onNetworkDidChange: networkController.on.bind(
-      networkController,
-      NETWORK_EVENTS.NETWORK_DID_CHANGE,
-    ),
+    onNetworkDidChange:
+      networkController.onNetworkDidChange.bind(networkController),
     preferencesStore,
     version: '0.0.1',
     environment: 'test',
diff --git a/app/scripts/controllers/network/index.js b/app/scripts/controllers/network/index.js
index dbb003ff1..b91e16698 100644
--- a/app/scripts/controllers/network/index.js
+++ b/app/scripts/controllers/network/index.js
@@ -1 +1 @@
-export { default, NETWORK_EVENTS } from './network-controller';
+export { default, NetworkControllerEventTypes } from './network-controller';
diff --git a/app/scripts/controllers/network/network-controller.js b/app/scripts/controllers/network/network-controller.js
index 06d236e26..0fa749d36 100644
--- a/app/scripts/controllers/network/network-controller.js
+++ b/app/scripts/controllers/network/network-controller.js
@@ -7,6 +7,9 @@ import {
   createEventEmitterProxy,
 } from 'swappable-obj-proxy';
 import EthQuery from 'eth-query';
+// ControllerMessenger is referred to in the JSDocs
+// eslint-disable-next-line no-unused-vars
+import { ControllerMessenger } from '@metamask/base-controller';
 import { v4 as random } from 'uuid';
 import {
   INFURA_PROVIDER_TYPES,
@@ -36,6 +39,8 @@ import { createNetworkClient } from './create-network-client';
 const env = process.env.METAMASK_ENV;
 const fetchWithTimeout = getFetchWithTimeout();
 
+const name = 'NetworkController';
+
 let defaultProviderConfigOpts;
 if (process.env.IN_TEST) {
   defaultProviderConfigOpts = {
@@ -66,15 +71,30 @@ const defaultNetworkDetailsState = {
   EIPS: { 1559: undefined },
 };
 
-export const NETWORK_EVENTS = {
-  // Fired after the actively selected network is changed
-  NETWORK_DID_CHANGE: 'networkDidChange',
-  // Fired when the actively selected network *will* change
-  NETWORK_WILL_CHANGE: 'networkWillChange',
-  // Fired when Infura returns an error indicating no support
-  INFURA_IS_BLOCKED: 'infuraIsBlocked',
-  // Fired when not using an Infura network or when Infura returns no error, indicating support
-  INFURA_IS_UNBLOCKED: 'infuraIsUnblocked',
+/**
+ * The set of event types that this controller can publish via its messenger.
+ */
+export const NetworkControllerEventTypes = {
+  /**
+   * Fired after the current network is changed.
+   */
+  NetworkDidChange: `${name}:networkDidChange`,
+  /**
+   * Fired when there is a request to change the current network, but no state
+   * changes have occurred yet.
+   */
+  NetworkWillChange: `${name}:networkWillChange`,
+  /**
+   * Fired after the network is changed to an Infura network, but when Infura
+   * returns an error denying support for the user's location.
+   */
+  InfuraIsBlocked: `${name}:infuraIsBlocked`,
+  /**
+   * Fired after the network is changed to an Infura network and Infura does not
+   * return an error denying support for the user's location, or after the
+   * network is changed to a custom network.
+   */
+  InfuraIsUnblocked: `${name}:infuraIsUnblocked`,
 };
 
 export default class NetworkController extends EventEmitter {
@@ -83,14 +103,22 @@ export default class NetworkController extends EventEmitter {
   /**
    * Construct a NetworkController.
    *
-   * @param {object} [options] - NetworkController options.
+   * @param {object} options - Options for this controller.
+   * @param {ControllerMessenger} options.messenger - The controller messenger.
    * @param {object} [options.state] - Initial controller state.
    * @param {string} [options.infuraProjectId] - The Infura project ID.
    * @param {string} [options.trackMetaMetricsEvent] - A method to forward events to the MetaMetricsController
    */
-  constructor({ state = {}, infuraProjectId, trackMetaMetricsEvent } = {}) {
+  constructor({
+    messenger,
+    state = {},
+    infuraProjectId,
+    trackMetaMetricsEvent,
+  } = {}) {
     super();
 
+    this.messenger = messenger;
+
     // create stores
     this.providerStore = new ObservableStore(
       state.provider || { ...defaultProviderConfig },
@@ -134,11 +162,8 @@ export default class NetworkController extends EventEmitter {
       throw new Error('Invalid Infura project ID');
     }
     this._infuraProjectId = infuraProjectId;
-    this._trackMetaMetricsEvent = trackMetaMetricsEvent;
 
-    this.on(NETWORK_EVENTS.NETWORK_DID_CHANGE, () => {
-      this.lookupNetwork();
-    });
+    this._trackMetaMetricsEvent = trackMetaMetricsEvent;
   }
 
   /**
@@ -210,7 +235,7 @@ export default class NetworkController extends EventEmitter {
     if (isInfura) {
       this._checkInfuraAvailability(type);
     } else {
-      this.emit(NETWORK_EVENTS.INFURA_IS_UNBLOCKED);
+      this.messenger.publish(NetworkControllerEventTypes.InfuraIsUnblocked);
     }
 
     let networkVersion;
@@ -373,9 +398,17 @@ export default class NetworkController extends EventEmitter {
     const rpcUrl = `https://${network}.infura.io/v3/${this._infuraProjectId}`;
 
     let networkChanged = false;
-    this.once(NETWORK_EVENTS.NETWORK_DID_CHANGE, () => {
+    const listener = () => {
       networkChanged = true;
-    });
+      this.messenger.unsubscribe(
+        NetworkControllerEventTypes.NetworkDidChange,
+        listener,
+      );
+    };
+    this.messenger.subscribe(
+      NetworkControllerEventTypes.NetworkDidChange,
+      listener,
+    );
 
     try {
       const response = await fetchWithTimeout(rpcUrl, {
@@ -393,14 +426,14 @@ export default class NetworkController extends EventEmitter {
       }
 
       if (response.ok) {
-        this.emit(NETWORK_EVENTS.INFURA_IS_UNBLOCKED);
+        this.messenger.publish(NetworkControllerEventTypes.InfuraIsUnblocked);
       } else {
         const responseMessage = await response.json();
         if (networkChanged) {
           return;
         }
         if (responseMessage.error === INFURA_BLOCKED_KEY) {
-          this.emit(NETWORK_EVENTS.INFURA_IS_BLOCKED);
+          this.messenger.publish(NetworkControllerEventTypes.InfuraIsBlocked);
         }
       }
     } catch (err) {
@@ -410,7 +443,7 @@ export default class NetworkController extends EventEmitter {
 
   _switchNetwork(opts) {
     // Indicate to subscribers that network is about to change
-    this.emit(NETWORK_EVENTS.NETWORK_WILL_CHANGE);
+    this.messenger.publish(NetworkControllerEventTypes.NetworkWillChange);
     // Set loading state
     this._setNetworkState('loading');
     // Reset network details
@@ -418,7 +451,11 @@ export default class NetworkController extends EventEmitter {
     // Configure the provider appropriately
     this._configureProvider(opts);
     // Notify subscribers that network has changed
-    this.emit(NETWORK_EVENTS.NETWORK_DID_CHANGE, opts.type);
+    this.messenger.publish(
+      NetworkControllerEventTypes.NetworkDidChange,
+      opts.type,
+    );
+    this.lookupNetwork();
   }
 
   _configureProvider({ type, rpcUrl, chainId }) {
diff --git a/app/scripts/controllers/network/network-controller.test.js b/app/scripts/controllers/network/network-controller.test.js
index cd4e9a782..ce160a65a 100644
--- a/app/scripts/controllers/network/network-controller.test.js
+++ b/app/scripts/controllers/network/network-controller.test.js
@@ -4,6 +4,7 @@ import { v4 } from 'uuid';
 import nock from 'nock';
 import sinon from 'sinon';
 import * as ethJsonRpcProvider from '@metamask/eth-json-rpc-provider';
+import { ControllerMessenger } from '@metamask/base-controller';
 import { BUILT_IN_NETWORKS } from '../../../../shared/constants/network';
 import { EVENT } from '../../../../shared/constants/metametrics';
 import NetworkController from './network-controller';
@@ -111,16 +112,6 @@ const BLOCK = POST_1559_BLOCK;
  */
 const DEFAULT_INFURA_PROJECT_ID = 'fake-infura-project-id';
 
-/**
- * Despite the signature of its constructor, NetworkController must take an
- * Infura project ID. This object is mixed into the options first when a
- * NetworkController is instantiated in tests.
- */
-const DEFAULT_CONTROLLER_OPTIONS = {
-  infuraProjectId: DEFAULT_INFURA_PROJECT_ID,
-  trackMetaMetricsEvent: jest.fn(),
-};
-
 /**
  * The set of properties allowed in a valid JSON-RPC response object.
  */
@@ -536,7 +527,9 @@ describe('NetworkController', () => {
 
   describe('destroy', () => {
     it('does not throw if called before the provider is initialized', async () => {
-      const controller = new NetworkController(DEFAULT_CONTROLLER_OPTIONS);
+      const controller = new NetworkController(
+        buildDefaultNetworkControllerOptions(),
+      );
 
       expect(await controller.destroy()).toBeUndefined();
     });
@@ -619,8 +612,11 @@ describe('NetworkController', () => {
         });
 
         it('emits infuraIsUnblocked (assuming that the request to eth_blockNumber responds successfully)', async () => {
+          const messenger = buildMessenger();
+
           await withController(
             {
+              messenger,
               state: {
                 provider: {
                   type: networkType,
@@ -633,15 +629,15 @@ describe('NetworkController', () => {
             async ({ controller, network }) => {
               network.mockEssentialRpcCalls();
 
-              const infuraIsUnblocked = await waitForEvent({
-                controller,
-                eventName: 'infuraIsUnblocked',
+              const infuraIsUnblocked = await waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsUnblocked',
                 operation: async () => {
                   await controller.initializeProvider();
                 },
               });
 
-              expect(infuraIsUnblocked).toBe(true);
+              expect(infuraIsUnblocked).toBeTruthy();
             },
           );
         });
@@ -755,8 +751,11 @@ describe('NetworkController', () => {
       });
 
       it('emits infuraIsUnblocked', async () => {
+        const messenger = buildMessenger();
+
         await withController(
           {
+            messenger,
             state: {
               provider: {
                 type: 'rpc',
@@ -778,15 +777,15 @@ describe('NetworkController', () => {
           async ({ controller, network }) => {
             network.mockEssentialRpcCalls();
 
-            const infuraIsUnblocked = await waitForEvent({
-              controller,
-              eventName: 'infuraIsUnblocked',
+            const infuraIsUnblocked = await waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:infuraIsUnblocked',
               operation: async () => {
                 await controller.initializeProvider();
               },
             });
 
-            expect(infuraIsUnblocked).toBe(true);
+            expect(infuraIsUnblocked).toBeTruthy();
           },
         );
       });
@@ -1161,12 +1160,14 @@ describe('NetworkController', () => {
       });
 
       it('does not emit infuraIsUnblocked', async () => {
-        await withController(async ({ controller, network }) => {
+        const messenger = buildMessenger();
+
+        await withController({ messenger }, async ({ controller, network }) => {
           network.mockEssentialRpcCalls();
 
-          const promiseForInfuraIsUnblocked = waitForEvent({
-            controller,
-            eventName: 'infuraIsUnblocked',
+          const promiseForInfuraIsUnblocked = waitForPublishedEvents({
+            messenger,
+            eventType: 'NetworkController:infuraIsUnblocked',
             operation: async () => {
               await controller.lookupNetwork();
             },
@@ -1177,12 +1178,14 @@ describe('NetworkController', () => {
       });
 
       it('does not emit infuraIsBlocked', async () => {
-        await withController(async ({ controller, network }) => {
+        const messenger = buildMessenger();
+
+        await withController({ messenger }, async ({ controller, network }) => {
           network.mockEssentialRpcCalls();
 
-          const promiseForInfuraIsBlocked = waitForEvent({
-            controller,
-            eventName: 'infuraIsBlocked',
+          const promiseForInfuraIsBlocked = waitForPublishedEvents({
+            messenger,
+            eventType: 'NetworkController:infuraIsBlocked',
             operation: async () => {
               await controller.lookupNetwork();
             },
@@ -1197,8 +1200,11 @@ describe('NetworkController', () => {
       describe(`when the type in the provider configuration is "${networkType}"`, () => {
         describe('if the request for eth_blockNumber responds successfully', () => {
           it('emits infuraIsUnblocked as long as the network has not changed by the time the request ends', async () => {
+            const messenger = buildMessenger();
+
             await withController(
               {
+                messenger,
                 state: {
                   provider: {
                     type: networkType,
@@ -1223,15 +1229,15 @@ describe('NetworkController', () => {
                   },
                 });
 
-                const infuraIsUnblocked = await waitForEvent({
-                  controller,
-                  eventName: 'infuraIsUnblocked',
+                const infuraIsUnblocked = await waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsUnblocked',
                   operation: async () => {
                     await controller.lookupNetwork();
                   },
                 });
 
-                expect(infuraIsUnblocked).toBe(true);
+                expect(infuraIsUnblocked).toBeTruthy();
               },
             );
           });
@@ -1247,8 +1253,11 @@ describe('NetworkController', () => {
               );
             }
 
+            const messenger = buildMessenger();
+
             await withController(
               {
+                messenger,
                 state: {
                   provider: {
                     type: networkType,
@@ -1265,9 +1274,9 @@ describe('NetworkController', () => {
                       result: '0x42',
                     },
                     beforeCompleting: async () => {
-                      await waitForEvent({
-                        controller,
-                        eventName: 'networkDidChange',
+                      await waitForPublishedEvents({
+                        messenger,
+                        eventType: 'NetworkController:networkDidChange',
                         operation: async () => {
                           await withoutCallingLookupNetwork({
                             controller,
@@ -1295,9 +1304,9 @@ describe('NetworkController', () => {
                   },
                 });
 
-                const promiseForInfuraIsUnblocked = waitForEvent({
-                  controller,
-                  eventName: 'infuraIsUnblocked',
+                const promiseForInfuraIsUnblocked = waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsUnblocked',
                   operation: async () => {
                     await controller.lookupNetwork();
                   },
@@ -1311,8 +1320,11 @@ describe('NetworkController', () => {
 
         describe('if the request for eth_blockNumber responds with a "countryBlocked" error', () => {
           it('emits infuraIsBlocked as long as the network has not changed by the time the request ends', async () => {
+            const messenger = buildMessenger();
+
             await withController(
               {
+                messenger,
                 state: {
                   provider: {
                     type: networkType,
@@ -1338,22 +1350,25 @@ describe('NetworkController', () => {
                   },
                 });
 
-                const infuraIsBlocked = await waitForEvent({
-                  controller,
-                  eventName: 'infuraIsBlocked',
+                const infuraIsBlocked = await waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsBlocked',
                   operation: async () => {
                     await controller.lookupNetwork();
                   },
                 });
 
-                expect(infuraIsBlocked).toBe(true);
+                expect(infuraIsBlocked).toBeTruthy();
               },
             );
           });
 
           it('does not emit infuraIsBlocked if the network has changed by the time the request ends', async () => {
+            const messenger = buildMessenger();
+
             await withController(
               {
+                messenger,
                 state: {
                   provider: {
                     type: networkType,
@@ -1382,9 +1397,9 @@ describe('NetworkController', () => {
                       await withoutCallingLookupNetwork({
                         controller,
                         operation: async () => {
-                          await waitForEvent({
-                            controller,
-                            eventName: 'networkDidChange',
+                          await waitForPublishedEvents({
+                            messenger,
+                            eventType: 'NetworkController:networkDidChange',
                             operation: () => {
                               controller.setActiveNetwork(
                                 'testNetworkConfigurationId',
@@ -1399,7 +1414,7 @@ describe('NetworkController', () => {
                 const network2 = new NetworkCommunications({
                   networkClientType: 'rpc',
                   networkClientOptions: {
-                    customRpcUrl: 'http://some-rpc-url',
+                    customRpcUrl: 'https://mock-rpc-url',
                   },
                 });
                 network2.mockEssentialRpcCalls();
@@ -1410,9 +1425,9 @@ describe('NetworkController', () => {
                   },
                 });
 
-                const promiseForInfuraIsBlocked = waitForEvent({
-                  controller,
-                  eventName: 'infuraIsBlocked',
+                const promiseForInfuraIsBlocked = waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsBlocked',
                   operation: async () => {
                     await controller.lookupNetwork();
                   },
@@ -1426,8 +1441,11 @@ describe('NetworkController', () => {
 
         describe('if the request for eth_blockNumber responds with a generic error', () => {
           it('does not emit infuraIsUnblocked', async () => {
+            const messenger = buildMessenger();
+
             await withController(
               {
+                messenger,
                 state: {
                   provider: {
                     type: networkType,
@@ -1453,9 +1471,9 @@ describe('NetworkController', () => {
                   },
                 });
 
-                const promiseForInfuraIsUnblocked = waitForEvent({
-                  controller,
-                  eventName: 'infuraIsUnblocked',
+                const promiseForInfuraIsUnblocked = waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsUnblocked',
                   operation: async () => {
                     await controller.lookupNetwork();
                   },
@@ -1906,8 +1924,11 @@ describe('NetworkController', () => {
 
     describe(`when the type in the provider configuration is "rpc"`, () => {
       it('emits infuraIsUnblocked', async () => {
+        const messenger = buildMessenger();
+
         await withController(
           {
+            messenger,
             state: {
               provider: {
                 type: 'rpc',
@@ -1935,15 +1956,15 @@ describe('NetworkController', () => {
               },
             });
 
-            const infuraIsUnblocked = await waitForEvent({
-              controller,
-              eventName: 'infuraIsUnblocked',
+            const infuraIsUnblocked = await waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:infuraIsUnblocked',
               operation: async () => {
                 await controller.lookupNetwork();
               },
             });
 
-            expect(infuraIsUnblocked).toBe(true);
+            expect(infuraIsUnblocked).toBeTruthy();
           },
         );
       });
@@ -2646,8 +2667,11 @@ describe('NetworkController', () => {
     });
 
     it('emits networkWillChange before making any changes to the network store', async () => {
+      const messenger = buildMessenger();
+
       await withController(
         {
+          messenger,
           state: {
             provider: {
               type: 'rpc',
@@ -2702,9 +2726,9 @@ describe('NetworkController', () => {
           const initialNetwork = controller.store.getState().network;
           expect(initialNetwork).toBe('42');
 
-          const networkWillChange = await waitForEvent({
-            controller,
-            eventName: 'networkWillChange',
+          const networkWillChange = await waitForPublishedEvents({
+            messenger,
+            eventType: 'NetworkController:networkWillChange',
             operation: () => {
               controller.setActiveNetwork('testNetworkConfigurationId2');
             },
@@ -2712,7 +2736,7 @@ describe('NetworkController', () => {
               expect(controller.store.getState().network).toBe(initialNetwork);
             },
           });
-          expect(networkWillChange).toBe(true);
+          expect(networkWillChange).toBeTruthy();
         },
       );
     });
@@ -2927,8 +2951,11 @@ describe('NetworkController', () => {
     });
 
     it('emits networkDidChange', async () => {
+      const messenger = buildMessenger();
+
       await withController(
         {
+          messenger,
           state: {
             networkConfigurations: {
               testNetworkConfigurationId: {
@@ -2949,22 +2976,25 @@ describe('NetworkController', () => {
           });
           network.mockEssentialRpcCalls();
 
-          const networkDidChange = await waitForEvent({
-            controller,
-            eventName: 'networkDidChange',
+          const networkDidChange = await waitForPublishedEvents({
+            messenger,
+            eventType: 'NetworkController:networkDidChange',
             operation: () => {
               controller.setActiveNetwork('testNetworkConfigurationId');
             },
           });
 
-          expect(networkDidChange).toBe(true);
+          expect(networkDidChange).toBeTruthy();
         },
       );
     });
 
     it('emits infuraIsUnblocked', async () => {
+      const messenger = buildMessenger();
+
       await withController(
         {
+          messenger,
           state: {
             networkConfigurations: {
               testNetworkConfigurationId: {
@@ -2985,15 +3015,15 @@ describe('NetworkController', () => {
           });
           network.mockEssentialRpcCalls();
 
-          const infuraIsUnblocked = await waitForEvent({
-            controller,
-            eventName: 'infuraIsUnblocked',
+          const infuraIsUnblocked = await waitForPublishedEvents({
+            messenger,
+            eventType: 'NetworkController:infuraIsUnblocked',
             operation: () => {
               controller.setActiveNetwork('testNetworkConfigurationId');
             },
           });
 
-          expect(infuraIsUnblocked).toBe(true);
+          expect(infuraIsUnblocked).toBeTruthy();
         },
       );
     });
@@ -3224,7 +3254,9 @@ describe('NetworkController', () => {
         });
 
         it('emits networkWillChange', async () => {
-          await withController(async ({ controller }) => {
+          const messenger = buildMessenger();
+
+          await withController({ messenger }, async ({ controller }) => {
             const network = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
@@ -3233,15 +3265,15 @@ describe('NetworkController', () => {
             });
             network.mockEssentialRpcCalls();
 
-            const networkWillChange = await waitForEvent({
-              controller,
-              eventName: 'networkWillChange',
+            const networkWillChange = await waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:networkWillChange',
               operation: () => {
                 controller.setProviderType(networkType);
               },
             });
 
-            expect(networkWillChange).toBe(true);
+            expect(networkWillChange).toBeTruthy();
           });
         });
 
@@ -3406,7 +3438,9 @@ describe('NetworkController', () => {
         });
 
         it('emits networkDidChange', async () => {
-          await withController(async ({ controller }) => {
+          const messenger = buildMessenger();
+
+          await withController({ messenger }, async ({ controller }) => {
             const network = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
@@ -3415,20 +3449,22 @@ describe('NetworkController', () => {
             });
             network.mockEssentialRpcCalls();
 
-            const networkDidChange = await waitForEvent({
-              controller,
-              eventName: 'networkDidChange',
+            const networkDidChange = await waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:networkDidChange',
               operation: () => {
                 controller.setProviderType(networkType);
               },
             });
 
-            expect(networkDidChange).toBe(true);
+            expect(networkDidChange).toBeTruthy();
           });
         });
 
         it('emits infuraIsUnblocked (assuming that the request for eth_blockNumber responds successfully)', async () => {
-          await withController(async ({ controller }) => {
+          const messenger = buildMessenger();
+
+          await withController({ messenger }, async ({ controller }) => {
             const network = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
@@ -3437,15 +3473,15 @@ describe('NetworkController', () => {
             });
             network.mockEssentialRpcCalls();
 
-            const infuraIsUnblocked = await waitForEvent({
-              controller,
-              eventName: 'infuraIsUnblocked',
-              operation: () => {
+            const infuraIsUnblocked = await waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:infuraIsUnblocked',
+              operation: async () => {
                 controller.setProviderType(networkType);
               },
             });
 
-            expect(infuraIsUnblocked).toBe(true);
+            expect(infuraIsUnblocked).toBeTruthy();
           });
         });
 
@@ -3541,8 +3577,11 @@ describe('NetworkController', () => {
     } of INFURA_NETWORKS) {
       describe(`when the type in the provider configuration is "${networkType}"`, () => {
         it('emits networkWillChange', async () => {
+          const messenger = buildMessenger();
+
           await withController(
             {
+              messenger,
               state: {
                 provider: {
                   type: networkType,
@@ -3555,15 +3594,15 @@ describe('NetworkController', () => {
             async ({ controller, network }) => {
               network.mockEssentialRpcCalls();
 
-              const networkWillChange = await waitForEvent({
-                controller,
-                eventName: 'networkWillChange',
+              const networkWillChange = await waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:networkWillChange',
                 operation: () => {
                   controller.resetConnection();
                 },
               });
 
-              expect(networkWillChange).toBe(true);
+              expect(networkWillChange).toBeTruthy();
             },
           );
         });
@@ -3708,8 +3747,11 @@ describe('NetworkController', () => {
         });
 
         it('emits networkDidChange', async () => {
+          const messenger = buildMessenger();
+
           await withController(
             {
+              messenger,
               state: {
                 provider: {
                   type: networkType,
@@ -3722,22 +3764,25 @@ describe('NetworkController', () => {
             async ({ controller, network }) => {
               network.mockEssentialRpcCalls();
 
-              const networkDidChange = await waitForEvent({
-                controller,
-                eventName: 'networkDidChange',
+              const networkDidChange = await waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:networkDidChange',
                 operation: () => {
                   controller.resetConnection();
                 },
               });
 
-              expect(networkDidChange).toBe(true);
+              expect(networkDidChange).toBeTruthy();
             },
           );
         });
 
         it('emits infuraIsUnblocked (assuming that the request for eth_blockNumber responds successfully)', async () => {
+          const messenger = buildMessenger();
+
           await withController(
             {
+              messenger,
               state: {
                 provider: {
                   type: networkType,
@@ -3750,15 +3795,15 @@ describe('NetworkController', () => {
             async ({ controller, network }) => {
               network.mockEssentialRpcCalls();
 
-              const infuraIsUnblocked = await waitForEvent({
-                controller,
-                eventName: 'infuraIsUnblocked',
+              const infuraIsUnblocked = await waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsUnblocked',
                 operation: () => {
                   controller.resetConnection();
                 },
               });
 
-              expect(infuraIsUnblocked).toBe(true);
+              expect(infuraIsUnblocked).toBeTruthy();
             },
           );
         });
@@ -3825,8 +3870,11 @@ describe('NetworkController', () => {
 
     describe(`when the type in the provider configuration is "rpc"`, () => {
       it('emits networkWillChange', async () => {
+        const messenger = buildMessenger();
+
         await withController(
           {
+            messenger,
             state: {
               provider: {
                 type: 'rpc',
@@ -3848,15 +3896,15 @@ describe('NetworkController', () => {
           async ({ controller, network }) => {
             network.mockEssentialRpcCalls();
 
-            const networkWillChange = await waitForEvent({
-              controller,
-              eventName: 'networkWillChange',
+            const networkWillChange = await waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:networkWillChange',
               operation: () => {
                 controller.resetConnection();
               },
             });
 
-            expect(networkWillChange).toBe(true);
+            expect(networkWillChange).toBeTruthy();
           },
         );
       });
@@ -4047,8 +4095,11 @@ describe('NetworkController', () => {
       });
 
       it('emits networkDidChange', async () => {
+        const messenger = buildMessenger();
+
         await withController(
           {
+            messenger,
             state: {
               provider: {
                 type: 'rpc',
@@ -4070,22 +4121,25 @@ describe('NetworkController', () => {
           async ({ controller, network }) => {
             network.mockEssentialRpcCalls();
 
-            const networkDidChange = await waitForEvent({
-              controller,
-              eventName: 'networkDidChange',
+            const networkDidChange = await waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:networkDidChange',
               operation: () => {
                 controller.resetConnection();
               },
             });
 
-            expect(networkDidChange).toBe(true);
+            expect(networkDidChange).toBeTruthy();
           },
         );
       });
 
       it('emits infuraIsUnblocked', async () => {
+        const messenger = buildMessenger();
+
         await withController(
           {
+            messenger,
             state: {
               provider: {
                 type: 'rpc',
@@ -4107,15 +4161,15 @@ describe('NetworkController', () => {
           async ({ controller, network }) => {
             network.mockEssentialRpcCalls();
 
-            const infuraIsUnblocked = await waitForEvent({
-              controller,
-              eventName: 'infuraIsUnblocked',
+            const infuraIsUnblocked = await waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:infuraIsUnblocked',
               operation: () => {
                 controller.resetConnection();
               },
             });
 
-            expect(infuraIsUnblocked).toBe(true);
+            expect(infuraIsUnblocked).toBeTruthy();
           },
         );
       });
@@ -4304,8 +4358,11 @@ describe('NetworkController', () => {
         });
 
         it('emits networkWillChange', async () => {
+          const messenger = buildMessenger();
+
           await withController(
             {
+              messenger,
               state: {
                 provider: {
                   type: networkType,
@@ -4347,15 +4404,15 @@ describe('NetworkController', () => {
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: async () => {
-                  const networkWillChange = await waitForEvent({
-                    controller,
-                    eventName: 'networkWillChange',
+                  const networkWillChange = await waitForPublishedEvents({
+                    messenger,
+                    eventType: 'NetworkController:networkWillChange',
                     operation: () => {
                       controller.rollbackToPreviousProvider();
                     },
                   });
 
-                  expect(networkWillChange).toBe(true);
+                  expect(networkWillChange).toBeTruthy();
                 },
               });
             },
@@ -4624,8 +4681,11 @@ describe('NetworkController', () => {
         });
 
         it('emits networkDidChange', async () => {
+          const messenger = buildMessenger();
+
           await withController(
             {
+              messenger,
               state: {
                 provider: {
                   type: networkType,
@@ -4668,14 +4728,14 @@ describe('NetworkController', () => {
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: async () => {
-                  const networkDidChange = await waitForEvent({
-                    controller,
-                    eventName: 'networkDidChange',
+                  const networkDidChange = await waitForPublishedEvents({
+                    messenger,
+                    eventType: 'NetworkController:networkDidChange',
                     operation: () => {
                       controller.rollbackToPreviousProvider();
                     },
                   });
-                  expect(networkDidChange).toBe(true);
+                  expect(networkDidChange).toBeTruthy();
                 },
               });
             },
@@ -4683,8 +4743,11 @@ describe('NetworkController', () => {
         });
 
         it('emits infuraIsUnblocked (assuming that the request for eth_blockNumber responds successfully)', async () => {
+          const messenger = buildMessenger();
+
           await withController(
             {
+              messenger,
               state: {
                 provider: {
                   type: networkType,
@@ -4727,15 +4790,15 @@ describe('NetworkController', () => {
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: async () => {
-                  const infuraIsUnblocked = await waitForEvent({
-                    controller,
-                    eventName: 'infuraIsUnblocked',
+                  const infuraIsUnblocked = await waitForPublishedEvents({
+                    messenger,
+                    eventType: 'NetworkController:infuraIsUnblocked',
                     operation: () => {
                       controller.rollbackToPreviousProvider();
                     },
                   });
 
-                  expect(infuraIsUnblocked).toBe(true);
+                  expect(infuraIsUnblocked).toBeTruthy();
                 },
               });
             },
@@ -4962,8 +5025,11 @@ describe('NetworkController', () => {
       });
 
       it('emits networkWillChange', async () => {
+        const messenger = buildMessenger();
+
         await withController(
           {
+            messenger,
             state: {
               provider: {
                 type: 'rpc',
@@ -5007,15 +5073,15 @@ describe('NetworkController', () => {
             await waitForLookupNetworkToComplete({
               controller,
               operation: async () => {
-                const networkWillChange = await waitForEvent({
-                  controller,
-                  eventName: 'networkWillChange',
+                const networkWillChange = await waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:networkWillChange',
                   operation: () => {
                     controller.rollbackToPreviousProvider();
                   },
                 });
 
-                expect(networkWillChange).toBe(true);
+                expect(networkWillChange).toBeTruthy();
               },
             });
           },
@@ -5262,8 +5328,11 @@ describe('NetworkController', () => {
       });
 
       it('emits networkDidChange', async () => {
+        const messenger = buildMessenger();
+
         await withController(
           {
+            messenger,
             state: {
               provider: {
                 type: 'rpc',
@@ -5302,14 +5371,14 @@ describe('NetworkController', () => {
             await waitForLookupNetworkToComplete({
               controller,
               operation: async () => {
-                const networkDidChange = await waitForEvent({
-                  controller,
-                  eventName: 'networkDidChange',
+                const networkDidChange = await waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:networkDidChange',
                   operation: () => {
                     controller.rollbackToPreviousProvider();
                   },
                 });
-                expect(networkDidChange).toBe(true);
+                expect(networkDidChange).toBeTruthy();
               },
             });
           },
@@ -5317,8 +5386,11 @@ describe('NetworkController', () => {
       });
 
       it('emits infuraIsUnblocked', async () => {
+        const messenger = buildMessenger();
+
         await withController(
           {
+            messenger,
             state: {
               provider: {
                 type: 'rpc',
@@ -5357,15 +5429,15 @@ describe('NetworkController', () => {
             await waitForLookupNetworkToComplete({
               controller,
               operation: async () => {
-                const infuraIsUnblocked = await waitForEvent({
-                  controller,
-                  eventName: 'infuraIsUnblocked',
+                const infuraIsUnblocked = await waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsUnblocked',
                   operation: () => {
                     controller.rollbackToPreviousProvider();
                   },
                 });
 
-                expect(infuraIsUnblocked).toBe(true);
+                expect(infuraIsUnblocked).toBeTruthy();
               },
             });
           },
@@ -6097,6 +6169,40 @@ describe('NetworkController', () => {
   });
 });
 
+/**
+ * Builds the controller messenger that NetworkController is designed to work
+ * with.
+ *
+ * @returns The controller messenger.
+ */
+function buildMessenger() {
+  return new ControllerMessenger().getRestricted({
+    name: 'NetworkController',
+    allowedActions: [],
+    allowedEvents: [
+      'NetworkController:networkDidChange',
+      'NetworkController:networkWillChange',
+      'NetworkController:infuraIsBlocked',
+      'NetworkController:infuraIsUnblocked',
+    ],
+  });
+}
+
+/**
+ * Despite the signature of its constructor, NetworkController must take an
+ * Infura project ID. The object that this function returns is mixed into the
+ * options first when a NetworkController is instantiated in tests.
+ *
+ * @returns {object} The controller options.
+ */
+function buildDefaultNetworkControllerOptions() {
+  return {
+    messenger: buildMessenger(),
+    infuraProjectId: DEFAULT_INFURA_PROJECT_ID,
+    trackMetaMetricsEvent: jest.fn(),
+  };
+}
+
 /**
  * Builds a controller based on the given options, and calls the given function
  * with that controller.
@@ -6108,11 +6214,11 @@ describe('NetworkController', () => {
  * @returns Whatever the callback returns.
  */
 async function withController(...args) {
-  const [givenConstructorOptions, fn] =
+  const [givenNetworkControllerOptions, fn] =
     args.length === 2 ? args : [{}, args[0]];
   const constructorOptions = {
-    ...DEFAULT_CONTROLLER_OPTIONS,
-    ...givenConstructorOptions,
+    ...buildDefaultNetworkControllerOptions(),
+    ...givenNetworkControllerOptions,
   };
   const controller = new NetworkController(constructorOptions);
 
@@ -6323,43 +6429,116 @@ async function waitForStateChanges({
 }
 
 /**
- * Waits for an event to occur on the controller before proceeding.
+ * Waits for controller events to be emitted before proceeding.
  *
- * @param {{controller: NetworkController, eventName: string, operation: (() => void | Promise<void>), beforeResolving?: (() => void | Promise<void>)}} args - The arguments.
- * @param {NetworkController} args.controller - The network controller
- * @param {string} args.eventName - The name of the event.
- * @param {() => void | Promise<void>} args.operation - A function that will
- * presumably produce the event in question.
- * @param {() => void | Promise<void>} [args.beforeResolving] - In some tests,
- * state updates happen so fast, we need to make an assertion immediately after
- * the event in question occurs. However, if we wait until the promise this
- * function returns resolves to do so, some other state update to the same
+ * @param {object} options - An options bag.
+ * @param {ControllerMessenger} options.messenger - The messenger suited for
+ * NetworkController.
+ * @param {string} options.eventType - The type of NetworkController event you
+ * want to wait for.
+ * @param {number} options.count - The number of events you expect to occur
+ * (default: 1).
+ * @param {(payload: any) => boolean} options.filter - A function used to
+ * discard events that are not of interest.
+ * @param {number} options.wait - The amount of time in milliseconds to wait for
+ * the expected number of filtered events to occur before resolving the promise
+ * that this function returns (default: 150).
+ * @param {() => void | Promise<void>} options.operation - A function to run
+ * that will presumably produce the events in question.
+ * @param {() => void | Promise<void>} [options.beforeResolving] - In some
+ * tests, state updates happen so fast, we need to make an assertion immediately
+ * after the event in question occurs. However, if we wait until the promise
+ * this function returns resolves to do so, some other state update to the same
  * property may have happened. This option allows you to make an assertion
  * _before_ the promise resolves. This has the added benefit of allowing you to
- * maintain the "arrange, act, assert" ordering in your test, meaning that
- * you can still call the method that kicks off the event and then make the
+ * maintain the "arrange, act, assert" ordering in your test, meaning that you
+ * can still call the method that kicks off the event and then make the
  * assertion afterward instead of the other way around.
- * @returns {Promise<true>}
+ * @returns A promise that resolves to the list of payloads for the set of
+ * events, optionally filtered, when a specific number of them have occurred.
  */
-async function waitForEvent({
-  controller,
-  eventName,
-  operation,
+async function waitForPublishedEvents({
+  messenger,
+  eventType,
+  count: expectedNumberOfEvents = 1,
+  filter: isEventPayloadInteresting = () => true,
+  wait: timeBeforeAssumingNoMoreEvents = 150,
+  operation = () => {
+    // do nothing
+  },
   beforeResolving = async () => {
     // do nothing
   },
 }) {
-  const promise = new Promise((resolve) => {
-    controller.once(eventName, () => {
-      Promise.resolve(beforeResolving()).then(() => {
-        resolve(true);
-      });
-    });
+  const promiseForEventPayloads = new Promise((resolve, reject) => {
+    // We need to declare this variable first, then assign it later, so that
+    // ESLint won't complain that resetTimer is referring to this variable
+    // before it's declared. And we need to use let so that we can assign it
+    // below.
+    /* eslint-disable-next-line prefer-const */
+    let eventListener;
+    let timer;
+    const allEventPayloads = [];
+    const interestingEventPayloads = [];
+    let alreadyEnded = false;
+
+    const end = () => {
+      if (!alreadyEnded) {
+        alreadyEnded = true;
+        messenger.unsubscribe(eventType.toString(), eventListener);
+        Promise.resolve(beforeResolving()).then(() => {
+          if (interestingEventPayloads.length === expectedNumberOfEvents) {
+            resolve(interestingEventPayloads);
+          } else {
+            // Using a string instead of an Error leads to better backtraces.
+            /* eslint-disable-next-line prefer-promise-reject-errors */
+            reject(
+              `Expected to receive ${expectedNumberOfEvents} ${eventType} event(s), but received ${
+                interestingEventPayloads.length
+              } after ${timeBeforeAssumingNoMoreEvents}ms.\n\nAll payloads:\n\n${inspect(
+                allEventPayloads,
+                { depth: null },
+              )}`,
+            );
+          }
+        });
+      }
+    };
+
+    const stopTimer = () => {
+      if (timer) {
+        clearTimeout(timer);
+      }
+    };
+
+    const resetTimer = () => {
+      stopTimer();
+      timer = originalSetTimeout(() => {
+        end();
+      }, timeBeforeAssumingNoMoreEvents);
+    };
+
+    eventListener = (...payload) => {
+      allEventPayloads.push(payload);
+
+      if (isEventPayloadInteresting(payload)) {
+        interestingEventPayloads.push(payload);
+        if (interestingEventPayloads.length === expectedNumberOfEvents) {
+          stopTimer();
+          end();
+        } else {
+          resetTimer();
+        }
+      }
+    };
+
+    messenger.subscribe(eventType.toString(), eventListener);
+    resetTimer();
   });
 
   await operation();
 
-  return await promise;
+  return await promiseForEventPayloads;
 }
 
 /**
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index c33e0f12a..101c37258 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -3,7 +3,6 @@ import { normalize as normalizeAddress } from 'eth-sig-util';
 import { IPFS_DEFAULT_GATEWAY_URL } from '../../../shared/constants/network';
 import { LedgerTransportTypes } from '../../../shared/constants/hardware-wallets';
 import { ThemeType } from '../../../shared/constants/preferences';
-import { NETWORK_EVENTS } from './network';
 
 export default class PreferencesController {
   /**
@@ -70,7 +69,8 @@ export default class PreferencesController {
       ...opts.initState,
     };
 
-    this.network = opts.network;
+    this._onInfuraIsBlocked = opts.onInfuraIsBlocked;
+    this._onInfuraIsUnblocked = opts.onInfuraIsUnblocked;
     this.store = new ObservableStore(initState);
     this.store.setMaxListeners(13);
     this.openPopup = opts.openPopup;
@@ -511,10 +511,11 @@ export default class PreferencesController {
   //
 
   _subscribeToInfuraAvailability() {
-    this.network.on(NETWORK_EVENTS.INFURA_IS_BLOCKED, () => {
+    this._onInfuraIsBlocked(() => {
       this._setInfuraBlocked(true);
     });
-    this.network.on(NETWORK_EVENTS.INFURA_IS_UNBLOCKED, () => {
+
+    this._onInfuraIsUnblocked(() => {
       this._setInfuraBlocked(false);
     });
   }
diff --git a/app/scripts/controllers/preferences.test.js b/app/scripts/controllers/preferences.test.js
index 21267195c..51f2ba5a0 100644
--- a/app/scripts/controllers/preferences.test.js
+++ b/app/scripts/controllers/preferences.test.js
@@ -19,8 +19,10 @@ describe('preferences controller', function () {
     const networkControllerProviderConfig = {
       getAccounts: () => undefined,
     };
+    const networkControllerMessenger = new ControllerMessenger();
     network = new NetworkController({
       infuraProjectId: 'foo',
+      messenger: networkControllerMessenger,
       state: {
         provider: {
           type: 'mainnet',
@@ -50,6 +52,8 @@ describe('preferences controller', function () {
       network,
       provider,
       tokenListController,
+      onInfuraIsBlocked: sinon.spy(),
+      onInfuraIsUnblocked: sinon.spy(),
     });
   });
 
diff --git a/app/scripts/controllers/swaps.js b/app/scripts/controllers/swaps.js
index 534aa54b7..f9737ef3a 100644
--- a/app/scripts/controllers/swaps.js
+++ b/app/scripts/controllers/swaps.js
@@ -41,7 +41,6 @@ import fetchEstimatedL1Fee from '../../../ui/helpers/utils/optimism/fetchEstimat
 
 import { Numeric } from '../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../shared/constants/common';
-import { NETWORK_EVENTS } from './network';
 
 // The MAX_GAS_LIMIT is a number that is higher than the maximum gas costs we have observed on any aggregator
 const MAX_GAS_LIMIT = 2500000;
@@ -114,6 +113,7 @@ export default class SwapsController {
     fetchTradesInfo = defaultFetchTradesInfo,
     getCurrentChainId,
     getEIP1559GasFeeEstimates,
+    onNetworkDidChange,
   }) {
     this.store = new ObservableStore({
       swapsState: { ...initialState.swapsState },
@@ -137,7 +137,7 @@ export default class SwapsController {
 
     this.ethersProvider = new Web3Provider(provider);
     this._currentNetwork = networkController.store.getState().network;
-    networkController.on(NETWORK_EVENTS.NETWORK_DID_CHANGE, (network) => {
+    onNetworkDidChange((network) => {
       if (network !== 'loading' && network !== this._currentNetwork) {
         this._currentNetwork = network;
         this.ethersProvider = new Web3Provider(provider);
diff --git a/app/scripts/controllers/swaps.test.js b/app/scripts/controllers/swaps.test.js
index 065540985..cebf695ae 100644
--- a/app/scripts/controllers/swaps.test.js
+++ b/app/scripts/controllers/swaps.test.js
@@ -14,7 +14,6 @@ import {
   FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER,
 } from '../../../shared/constants/smartTransactions';
 import SwapsController, { utils } from './swaps';
-import { NETWORK_EVENTS } from './network';
 
 const MOCK_FETCH_PARAMS = {
   slippage: 3,
@@ -104,10 +103,6 @@ function getMockNetworkController() {
         };
       },
     },
-    on: sinon
-      .stub()
-      .withArgs(NETWORK_EVENTS.NETWORK_DID_CHANGE)
-      .callsArgAsync(1),
   };
 }
 
@@ -162,6 +157,7 @@ describe('SwapsController', function () {
     return new SwapsController({
       getBufferedGasLimit: MOCK_GET_BUFFERED_GAS_LIMIT,
       networkController: getMockNetworkController(),
+      onNetworkDidChange: sinon.stub(),
       provider,
       getProviderConfig: MOCK_GET_PROVIDER_CONFIG,
       getTokenRatesState: MOCK_TOKEN_RATES_STORE,
@@ -209,9 +205,11 @@ describe('SwapsController', function () {
 
     it('should replace ethers instance when network changes', function () {
       const networkController = getMockNetworkController();
+      const onNetworkDidChange = sinon.stub();
       const swapsController = new SwapsController({
         getBufferedGasLimit: MOCK_GET_BUFFERED_GAS_LIMIT,
         networkController,
+        onNetworkDidChange,
         provider,
         getProviderConfig: MOCK_GET_PROVIDER_CONFIG,
         getTokenRatesState: MOCK_TOKEN_RATES_STORE,
@@ -219,9 +217,9 @@ describe('SwapsController', function () {
         getCurrentChainId: getCurrentChainIdStub,
       });
       const currentEthersInstance = swapsController.ethersProvider;
-      const onNetworkDidChange = networkController.on.getCall(0).args[1];
+      const changeNetwork = onNetworkDidChange.getCall(0).args[0];
 
-      onNetworkDidChange(NETWORK_IDS.MAINNET);
+      changeNetwork(NETWORK_IDS.MAINNET);
 
       const newEthersInstance = swapsController.ethersProvider;
       assert.notStrictEqual(
@@ -233,9 +231,11 @@ describe('SwapsController', function () {
 
     it('should not replace ethers instance when network changes to loading', function () {
       const networkController = getMockNetworkController();
+      const onNetworkDidChange = sinon.stub();
       const swapsController = new SwapsController({
         getBufferedGasLimit: MOCK_GET_BUFFERED_GAS_LIMIT,
         networkController,
+        onNetworkDidChange,
         provider,
         getProviderConfig: MOCK_GET_PROVIDER_CONFIG,
         getTokenRatesState: MOCK_TOKEN_RATES_STORE,
@@ -243,9 +243,9 @@ describe('SwapsController', function () {
         getCurrentChainId: getCurrentChainIdStub,
       });
       const currentEthersInstance = swapsController.ethersProvider;
-      const onNetworkDidChange = networkController.on.getCall(0).args[1];
+      const changeNetwork = onNetworkDidChange.getCall(0).args[0];
 
-      onNetworkDidChange('loading');
+      changeNetwork('loading');
 
       const newEthersInstance = swapsController.ethersProvider;
       assert.strictEqual(
@@ -257,9 +257,11 @@ describe('SwapsController', function () {
 
     it('should not replace ethers instance when network changes to the same network', function () {
       const networkController = getMockNetworkController();
+      const onNetworkDidChange = sinon.stub();
       const swapsController = new SwapsController({
         getBufferedGasLimit: MOCK_GET_BUFFERED_GAS_LIMIT,
         networkController,
+        onNetworkDidChange,
         provider,
         getProviderConfig: MOCK_GET_PROVIDER_CONFIG,
         getTokenRatesState: MOCK_TOKEN_RATES_STORE,
@@ -267,9 +269,9 @@ describe('SwapsController', function () {
         getCurrentChainId: getCurrentChainIdStub,
       });
       const currentEthersInstance = swapsController.ethersProvider;
-      const onNetworkDidChange = networkController.on.getCall(0).args[1];
+      const changeNetwork = onNetworkDidChange.getCall(0).args[0];
 
-      onNetworkDidChange(NETWORK_IDS.GOERLI);
+      changeNetwork(NETWORK_IDS.GOERLI);
 
       const newEthersInstance = swapsController.ethersProvider;
       assert.strictEqual(
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 2d210f2a1..70b05b8fe 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -135,7 +135,9 @@ import createTabIdMiddleware from './lib/createTabIdMiddleware';
 import createOnboardingMiddleware from './lib/createOnboardingMiddleware';
 import { setupMultiplex } from './lib/stream-utils';
 import EnsController from './controllers/ens';
-import NetworkController, { NETWORK_EVENTS } from './controllers/network';
+import NetworkController, {
+  NetworkControllerEventTypes,
+} from './controllers/network';
 import PreferencesController from './controllers/preferences';
 import AppStateController from './controllers/app-state';
 import CachedBalancesController from './controllers/cached-balances';
@@ -249,7 +251,12 @@ export default class MetamaskController extends EventEmitter {
       showApprovalRequest: opts.showUserConfirmation,
     });
 
+    const networkControllerMessenger = this.controllerMessenger.getRestricted({
+      name: 'NetworkController',
+      allowedEvents: Object.values(NetworkControllerEventTypes),
+    });
     this.networkController = new NetworkController({
+      messenger: networkControllerMessenger,
       state: initState.NetworkController,
       infuraProjectId: opts.infuraProjectId,
       trackMetaMetricsEvent: (...args) =>
@@ -292,7 +299,14 @@ export default class MetamaskController extends EventEmitter {
       initState: initState.PreferencesController,
       initLangCode: opts.initLangCode,
       openPopup: opts.openPopup,
-      network: this.networkController,
+      onInfuraIsBlocked: networkControllerMessenger.subscribe.bind(
+        networkControllerMessenger,
+        NetworkControllerEventTypes.InfuraIsBlocked,
+      ),
+      onInfuraIsUnblocked: networkControllerMessenger.subscribe.bind(
+        networkControllerMessenger,
+        NetworkControllerEventTypes.InfuraIsUnblocked,
+      ),
       tokenListController: this.tokenListController,
       provider: this.provider,
     });
@@ -320,8 +334,7 @@ export default class MetamaskController extends EventEmitter {
         onPreferencesStateChange: (listener) =>
           this.preferencesController.store.subscribe(listener),
         onNetworkStateChange: (cb) =>
-          this.networkController.on(NETWORK_EVENTS.NETWORK_DID_CHANGE, () => {
-            const networkState = this.networkController.store.getState();
+          this.networkController.store.subscribe((networkState) => {
             const modifiedNetworkState = {
               ...networkState,
               providerConfig: {
@@ -427,9 +440,9 @@ export default class MetamaskController extends EventEmitter {
     this.metaMetricsController = new MetaMetricsController({
       segment,
       preferencesStore: this.preferencesController.store,
-      onNetworkDidChange: this.networkController.on.bind(
-        this.networkController,
-        NETWORK_EVENTS.NETWORK_DID_CHANGE,
+      onNetworkDidChange: networkControllerMessenger.subscribe.bind(
+        networkControllerMessenger,
+        NetworkControllerEventTypes.NetworkDidChange,
       ),
       getNetworkIdentifier: () => {
         const { type, rpcUrl } =
@@ -464,9 +477,9 @@ export default class MetamaskController extends EventEmitter {
       clientId: SWAPS_CLIENT_ID,
       getProvider: () =>
         this.networkController.getProviderAndBlockTracker().provider,
-      onNetworkStateChange: this.networkController.on.bind(
-        this.networkController,
-        NETWORK_EVENTS.NETWORK_DID_CHANGE,
+      onNetworkStateChange: networkControllerMessenger.subscribe.bind(
+        networkControllerMessenger,
+        NetworkControllerEventTypes.NetworkDidChange,
       ),
       getCurrentNetworkEIP1559Compatibility:
         this.networkController.getEIP1559Compatibility.bind(
@@ -578,9 +591,9 @@ export default class MetamaskController extends EventEmitter {
       provider: this.provider,
       getCurrentChainId: () =>
         this.networkController.store.getState().provider.chainId,
-      onNetworkDidChange: this.networkController.on.bind(
-        this.networkController,
-        NETWORK_EVENTS.NETWORK_DID_CHANGE,
+      onNetworkDidChange: networkControllerMessenger.subscribe.bind(
+        networkControllerMessenger,
+        NetworkControllerEventTypes.NetworkDidChange,
       ),
     });
 
@@ -590,9 +603,9 @@ export default class MetamaskController extends EventEmitter {
 
     this.incomingTransactionsController = new IncomingTransactionsController({
       blockTracker: this.blockTracker,
-      onNetworkDidChange: this.networkController.on.bind(
-        this.networkController,
-        NETWORK_EVENTS.NETWORK_DID_CHANGE,
+      onNetworkDidChange: networkControllerMessenger.subscribe.bind(
+        networkControllerMessenger,
+        NetworkControllerEventTypes.NetworkDidChange,
       ),
       getCurrentChainId: () =>
         this.networkController.store.getState().provider.chainId,
@@ -1041,15 +1054,18 @@ export default class MetamaskController extends EventEmitter {
       }
     });
 
-    this.networkController.on(NETWORK_EVENTS.NETWORK_DID_CHANGE, async () => {
-      const { ticker } = this.networkController.store.getState().provider;
-      try {
-        await this.currencyRateController.setNativeCurrency(ticker);
-      } catch (error) {
-        // TODO: Handle failure to get conversion rate more gracefully
-        console.error(error);
-      }
-    });
+    networkControllerMessenger.subscribe(
+      NetworkControllerEventTypes.NetworkDidChange,
+      async () => {
+        const { ticker } = this.networkController.store.getState().provider;
+        try {
+          await this.currencyRateController.setNativeCurrency(ticker);
+        } catch (error) {
+          // TODO: Handle failure to get conversion rate more gracefully
+          console.error(error);
+        }
+      },
+    );
 
     this.networkController.lookupNetwork();
     this.decryptMessageManager = new DecryptMessageManager({
@@ -1083,6 +1099,10 @@ export default class MetamaskController extends EventEmitter {
         this.txController.txGasUtil,
       ),
       networkController: this.networkController,
+      onNetworkDidChange: networkControllerMessenger.subscribe.bind(
+        networkControllerMessenger,
+        NetworkControllerEventTypes.NetworkDidChange,
+      ),
       provider: this.provider,
       getProviderConfig: () => this.networkController.store.getState().provider,
       getTokenRatesState: () => this.tokenRatesController.state,
@@ -1122,17 +1142,23 @@ export default class MetamaskController extends EventEmitter {
     );
 
     // ensure accountTracker updates balances after network change
-    this.networkController.on(NETWORK_EVENTS.NETWORK_DID_CHANGE, () => {
-      this.accountTracker._updateAccounts();
-    });
+    networkControllerMessenger.subscribe(
+      NetworkControllerEventTypes.NetworkDidChange,
+      () => {
+        this.accountTracker._updateAccounts();
+      },
+    );
 
     // clear unapproved transactions and messages when the network will change
-    this.networkController.on(NETWORK_EVENTS.NETWORK_WILL_CHANGE, () => {
-      this.txController.txStateManager.clearUnapprovedTxs();
-      this.encryptionPublicKeyManager.clearUnapproved();
-      this.decryptMessageManager.clearUnapproved();
-      this.signController.clearUnapproved();
-    });
+    networkControllerMessenger.subscribe(
+      NetworkControllerEventTypes.NetworkWillChange,
+      () => {
+        this.txController.txStateManager.clearUnapprovedTxs();
+        this.encryptionPublicKeyManager.clearUnapproved();
+        this.decryptMessageManager.clearUnapproved();
+        this.signController.clearUnapproved();
+      },
+    );
 
     this.metamaskMiddleware = createMetamaskMiddleware({
       static: {

From 50d8740a0da3f1028af93099d439c6e7c8078831 Mon Sep 17 00:00:00 2001
From: Elliot Winkler <elliot.winkler@gmail.com>
Date: Thu, 30 Mar 2023 12:42:38 -0600
Subject: [PATCH 099/129] Ensure that TS files in shared/modules are linted
 (#18367)

Some TypeScript files in shared/modules are not being linted. Add them
to the ESLint config and fix any lint violations that arise from doing
so.
---
 .eslintrc.js                   |   2 +
 shared/modules/Numeric.test.ts | 404 +++++++++++++++++----------------
 shared/modules/error.test.ts   |  12 +-
 3 files changed, 220 insertions(+), 198 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c842db401..6851d9566 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -81,6 +81,7 @@ module.exports = {
       files: [
         'app/**/*.js',
         'shared/**/*.js',
+        'shared/**/*.ts',
         'ui/**/*.js',
         '**/*.test.js',
         'test/lib/**/*.js',
@@ -272,6 +273,7 @@ module.exports = {
         'app/scripts/platforms/*.test.js',
         'development/**/*.test.js',
         'shared/**/*.test.js',
+        'shared/**/*.test.ts',
         'test/helpers/*.js',
         'test/jest/*.js',
         'ui/**/*.test.js',
diff --git a/shared/modules/Numeric.test.ts b/shared/modules/Numeric.test.ts
index 2786bec91..33e8f4ee2 100644
--- a/shared/modules/Numeric.test.ts
+++ b/shared/modules/Numeric.test.ts
@@ -10,98 +10,98 @@ const ONE_WEI = new Numeric(1, 10, EtherDenomination.WEI);
 describe('Numeric', () => {
   describe('Basic Numeric Construction', () => {
     describe('From hexadeciaml strings', () => {
-      it('Should create a new Numeric from a hexadecimal string', () => {
+      it('should create a new Numeric from a hexadecimal string', () => {
         const numeric = new Numeric('0xa', 16);
-        expect(numeric.value).toEqual(new BigNumber(10, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(10, 10));
       });
 
-      it('Should create a new Numeric from a hexadecimal string with a decimal', () => {
+      it('should create a new Numeric from a hexadecimal string with a decimal', () => {
         const numeric = new Numeric('0xa.7', 16);
-        expect(numeric.value).toEqual(new BigNumber(10.4375, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(10.4375, 10));
       });
 
-      it('Should create a new Numeric from a hexadecimal string with negation', () => {
+      it('should create a new Numeric from a hexadecimal string with negation', () => {
         const numeric = new Numeric('-0xa', 16);
-        expect(numeric.value).toEqual(new BigNumber(-10, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(-10, 10));
       });
 
-      it('Should create a new Numeric from a hexadecimal string with negation and decimal', () => {
+      it('should create a new Numeric from a hexadecimal string with negation and decimal', () => {
         const numeric = new Numeric('-0xa.7', 16);
-        expect(numeric.value).toEqual(new BigNumber(-10.4375, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(-10.4375, 10));
       });
     });
 
     describe('From decimal strings', () => {
-      it('Should create a new Numeric from a decimal string', () => {
+      it('should create a new Numeric from a decimal string', () => {
         const numeric = new Numeric('10', 10);
-        expect(numeric.value).toEqual(new BigNumber(10, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(10, 10));
       });
 
-      it('Should create a new Numeric from a decimal string with a decimal', () => {
+      it('should create a new Numeric from a decimal string with a decimal', () => {
         const numeric = new Numeric('10.4375', 10);
-        expect(numeric.value).toEqual(new BigNumber(10.4375, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(10.4375, 10));
       });
 
-      it('Should create a new Numeric from a decimal string with negation', () => {
+      it('should create a new Numeric from a decimal string with negation', () => {
         const numeric = new Numeric('-10', 10);
-        expect(numeric.value).toEqual(new BigNumber(-10, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(-10, 10));
       });
 
-      it('Should create a new Numeric from a decimal string with negation and decimal', () => {
+      it('should create a new Numeric from a decimal string with negation and decimal', () => {
         const numeric = new Numeric('-10.4375', 10);
-        expect(numeric.value).toEqual(new BigNumber(-10.4375, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(-10.4375, 10));
       });
     });
 
     describe('From decimal numbers', () => {
-      it('Should create a new Numeric from a hexadecimal number', () => {
+      it('should create a new Numeric from a hexadecimal number', () => {
         const numeric = new Numeric(10, 10);
-        expect(numeric.value).toEqual(new BigNumber(10, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(10, 10));
       });
 
-      it('Should create a new Numeric from a hexadecimal string with a decimal', () => {
+      it('should create a new Numeric from a hexadecimal string with a decimal', () => {
         const numeric = new Numeric(10.4375, 10);
-        expect(numeric.value).toEqual(new BigNumber(10.4375, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(10.4375, 10));
       });
 
-      it('Should create a new Numeric from a hexadecimal string with negation', () => {
+      it('should create a new Numeric from a hexadecimal string with negation', () => {
         const numeric = new Numeric(-10, 10);
-        expect(numeric.value).toEqual(new BigNumber(-10, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(-10, 10));
       });
 
-      it('Should create a new Numeric from a hexadecimal string with negation and decimal', () => {
+      it('should create a new Numeric from a hexadecimal string with negation and decimal', () => {
         const numeric = new Numeric(-10.4375, 16);
-        expect(numeric.value).toEqual(new BigNumber(-10.4375, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(-10.4375, 10));
       });
     });
 
     describe('From BigNumbers or BN', () => {
-      it('Should create a new Numeric from a BigNumber', () => {
+      it('should create a new Numeric from a BigNumber', () => {
         const numeric = new Numeric(new BigNumber(100, 10));
-        expect(numeric.value).toEqual(new BigNumber(100, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(100, 10));
       });
 
-      it('Should create a new Numeric from a BN', () => {
+      it('should create a new Numeric from a BN', () => {
         const numeric = new Numeric(new BN(100, 10), 10);
-        expect(numeric.value).toEqual(new BigNumber(100, 10));
+        expect(numeric.value).toStrictEqual(new BigNumber(100, 10));
       });
     });
   });
 
   describe('Error checking', () => {
-    it('Should throw an error for a non numeric string', () => {
+    it('should throw an error for a non numeric string', () => {
       expect(() => new Numeric('Hello there', 10)).toThrow(
         'String provided to stringToBigNumber is not a hexadecimal or decimal string: Hello there, 10',
       );
     });
 
-    it('Should throw an error for a numeric string without a base', () => {
+    it('should throw an error for a numeric string without a base', () => {
       expect(() => new Numeric('10')).toThrow(
         'You must specify the base of the provided number if the value is not already a BigNumber',
       );
     });
 
-    it('Should throw an error for a non numeric type', () => {
+    it('should throw an error for a non numeric type', () => {
       expect(() => new Numeric(true as unknown as number, 10)).toThrow(
         'Value: true is not a string, number, BigNumber or BN. Type is: boolean.',
       );
@@ -109,454 +109,474 @@ describe('Numeric', () => {
   });
 
   describe('Erroneous behaviors that we are temporarily continuing', () => {
-    it('Handles values that are undefined, setting the value to 0', () => {
-      expect(new Numeric(undefined as unknown as number).toString()).toEqual(
-        '0',
-      );
+    it('handles values that are undefined, setting the value to 0', () => {
+      expect(
+        new Numeric(undefined as unknown as number).toString(),
+      ).toStrictEqual('0');
     });
 
-    it('Handles values that are NaN, setting the value to 0', () => {
-      expect(new Numeric(NaN).toString()).toEqual('0');
+    it('handles values that are NaN, setting the value to 0', () => {
+      expect(new Numeric(NaN).toString()).toStrictEqual('0');
     });
   });
 
   describe('Ether denomination conversion', () => {
     it('should convert 1 ETH to 1000000000 GWEI', () => {
-      expect(ONE_ETH.toDenomination(EtherDenomination.GWEI).toString()).toEqual(
-        '1000000000',
-      );
+      expect(
+        ONE_ETH.toDenomination(EtherDenomination.GWEI).toString(),
+      ).toStrictEqual('1000000000');
     });
 
     it('should convert 1 ETH to 1000000000000000000 WEI', () => {
-      expect(ONE_ETH.toDenomination(EtherDenomination.WEI).toString()).toEqual(
-        '1000000000000000000',
-      );
+      expect(
+        ONE_ETH.toDenomination(EtherDenomination.WEI).toString(),
+      ).toStrictEqual('1000000000000000000');
     });
 
     it('should convert 1 GWEI to 0.000000001 ETH', () => {
-      expect(ONE_GWEI.toDenomination(EtherDenomination.ETH).toString()).toEqual(
-        '0.000000001',
-      );
+      expect(
+        ONE_GWEI.toDenomination(EtherDenomination.ETH).toString(),
+      ).toStrictEqual('0.000000001');
     });
 
     it('should convert 1 GWEI to 1000000000 WEI', () => {
-      expect(ONE_GWEI.toDenomination(EtherDenomination.WEI).toString()).toEqual(
-        '1000000000',
-      );
+      expect(
+        ONE_GWEI.toDenomination(EtherDenomination.WEI).toString(),
+      ).toStrictEqual('1000000000');
     });
 
     it('should convert 1 WEI to 0 ETH due to rounding', () => {
-      expect(ONE_WEI.toDenomination(EtherDenomination.ETH).toString()).toEqual(
-        '0',
-      );
+      expect(
+        ONE_WEI.toDenomination(EtherDenomination.ETH).toString(),
+      ).toStrictEqual('0');
     });
 
     it('should convert 1 WEI to 0.000000001 GWEI', () => {
-      expect(ONE_WEI.toDenomination(EtherDenomination.GWEI).toString()).toEqual(
-        '0.000000001',
-      );
+      expect(
+        ONE_WEI.toDenomination(EtherDenomination.GWEI).toString(),
+      ).toStrictEqual('0.000000001');
     });
   });
 
   describe('Math operations', () => {
     describe('Multiplication', () => {
-      it('Should compute correct results for simple multiplication', () => {
-        expect(new Numeric(5, 10).times(5, 10).toNumber()).toEqual(25);
+      it('should compute correct results for simple multiplication', () => {
+        expect(new Numeric(5, 10).times(5, 10).toNumber()).toStrictEqual(25);
 
         expect(
           new Numeric(5, 10).times(new Numeric(10, 10)).toNumber(),
-        ).toEqual(50);
+        ).toStrictEqual(50);
 
         expect(
           new Numeric(25, 10).times(new Numeric(10, 10)).toNumber(),
-        ).toEqual(250);
+        ).toStrictEqual(250);
       });
 
-      it('Should compute correct results for multiplication of big numbers', () => {
+      it('should compute correct results for multiplication of big numbers', () => {
         expect(
           new Numeric('175671432', 10).times('686216', 10).toString(),
-        ).toEqual('120548547381312');
+        ).toStrictEqual('120548547381312');
 
         expect(
           new Numeric('1756714320', 10)
             .times(new Numeric('686216', 10))
             .toString(),
-        ).toEqual('1205485473813120');
+        ).toStrictEqual('1205485473813120');
 
         expect(
           new Numeric('41756714320', 10)
             .times(new Numeric('6862160', 10))
             .toString(),
-        ).toEqual('286541254738131200');
+        ).toStrictEqual('286541254738131200');
       });
 
-      it('Should compute correct results for multiplication of negative big numbers', () => {
+      it('should compute correct results for multiplication of negative big numbers', () => {
         expect(
           new Numeric('175671432', 10).times('-686216', 10).toString(),
-        ).toEqual('-120548547381312');
+        ).toStrictEqual('-120548547381312');
 
         expect(
           new Numeric('1756714320', 10)
             .times(new Numeric('-686216', 10))
             .toString(),
-        ).toEqual('-1205485473813120');
+        ).toStrictEqual('-1205485473813120');
 
         expect(
           new Numeric('-41756714320', 10)
             .times(new Numeric('-6862160', 10))
             .toString(),
-        ).toEqual('286541254738131200');
+        ).toStrictEqual('286541254738131200');
       });
     });
 
     describe('Division', () => {
-      it('Should compute correct results for simple division', () => {
-        expect(new Numeric(25, 10).divide(5, 10).toNumber()).toEqual(5);
+      it('should compute correct results for simple division', () => {
+        expect(new Numeric(25, 10).divide(5, 10).toNumber()).toStrictEqual(5);
 
         expect(
           new Numeric(50, 10).divide(new Numeric(10, 10)).toNumber(),
-        ).toEqual(5);
+        ).toStrictEqual(5);
 
         expect(
           new Numeric(250, 10).divide(new Numeric(10, 10)).toNumber(),
-        ).toEqual(25);
+        ).toStrictEqual(25);
       });
 
-      it('Should compute correct results for division of big numbers', () => {
+      it('should compute correct results for division of big numbers', () => {
         expect(
           new Numeric('175671432', 10).divide('686216', 10).toString(),
-        ).toEqual('256.00019818832554181191');
+        ).toStrictEqual('256.00019818832554181191');
 
         expect(
           new Numeric('1756714320', 10)
             .divide(new Numeric('686216', 10))
             .toString(),
-        ).toEqual('2560.00198188325541811908');
+        ).toStrictEqual('2560.00198188325541811908');
 
         expect(
           new Numeric('41756714320', 10)
             .divide(new Numeric('6862160', 10))
             .toString(),
-        ).toEqual('6085.06859647691106007438');
+        ).toStrictEqual('6085.06859647691106007438');
       });
 
-      it('Should compute correct results for division of negative big numbers', () => {
+      it('should compute correct results for division of negative big numbers', () => {
         expect(
           new Numeric('175671432', 10).divide('-686216', 10).toString(),
-        ).toEqual('-256.00019818832554181191');
+        ).toStrictEqual('-256.00019818832554181191');
 
         expect(
           new Numeric('1756714320', 10)
             .divide(new Numeric('-686216', 10))
             .toString(),
-        ).toEqual('-2560.00198188325541811908');
+        ).toStrictEqual('-2560.00198188325541811908');
 
         expect(
           new Numeric('-41756714320', 10)
             .divide(new Numeric('-6862160', 10))
             .toString(),
-        ).toEqual('6085.06859647691106007438');
+        ).toStrictEqual('6085.06859647691106007438');
       });
     });
 
     describe('Addition', () => {
-      it('Should compute correct results for simple addition', () => {
-        expect(new Numeric(25, 10).add(5, 10).toNumber()).toEqual(30);
+      it('should compute correct results for simple addition', () => {
+        expect(new Numeric(25, 10).add(5, 10).toNumber()).toStrictEqual(30);
 
-        expect(new Numeric(50, 10).add(new Numeric(10, 10)).toNumber()).toEqual(
-          60,
-        );
+        expect(
+          new Numeric(50, 10).add(new Numeric(10, 10)).toNumber(),
+        ).toStrictEqual(60);
 
         expect(
           new Numeric(250, 10).add(new Numeric(100, 10)).toNumber(),
-        ).toEqual(350);
+        ).toStrictEqual(350);
       });
 
-      it('Should compute correct results for addition of big numbers', () => {
+      it('should compute correct results for addition of big numbers', () => {
         expect(
           new Numeric('175671432', 10).add('686216', 10).toString(),
-        ).toEqual('176357648');
+        ).toStrictEqual('176357648');
 
         expect(
           new Numeric('1756714320', 10)
             .add(new Numeric('686216', 10))
             .toString(),
-        ).toEqual('1757400536');
+        ).toStrictEqual('1757400536');
 
         expect(
           new Numeric('41756714320', 10)
             .add(new Numeric('6862160', 10))
             .toString(),
-        ).toEqual('41763576480');
+        ).toStrictEqual('41763576480');
       });
 
-      it('Should compute correct results for addition of negative big numbers', () => {
+      it('should compute correct results for addition of negative big numbers', () => {
         expect(
           new Numeric('175671432', 10).add('-686216', 10).toString(),
-        ).toEqual('174985216');
+        ).toStrictEqual('174985216');
 
         expect(
           new Numeric('1756714320', 10)
             .add(new Numeric('-686216', 10))
             .toString(),
-        ).toEqual('1756028104');
+        ).toStrictEqual('1756028104');
 
         expect(
           new Numeric('-41756714320', 10)
             .add(new Numeric('-6862160', 10))
             .toString(),
-        ).toEqual('-41763576480');
+        ).toStrictEqual('-41763576480');
       });
     });
 
     describe('Subtraction', () => {
-      it('Should compute correct results for simple subtraction', () => {
-        expect(new Numeric(25, 10).minus(5, 10).toNumber()).toEqual(20);
+      it('should compute correct results for simple subtraction', () => {
+        expect(new Numeric(25, 10).minus(5, 10).toNumber()).toStrictEqual(20);
 
         expect(
           new Numeric(50, 10).minus(new Numeric(10, 10)).toNumber(),
-        ).toEqual(40);
+        ).toStrictEqual(40);
 
         expect(
           new Numeric(250, 10).minus(new Numeric(100, 10)).toNumber(),
-        ).toEqual(150);
+        ).toStrictEqual(150);
       });
 
-      it('Should compute correct results for subtraction of big numbers', () => {
+      it('should compute correct results for subtraction of big numbers', () => {
         expect(
           new Numeric('175671432', 10).minus('686216', 10).toString(),
-        ).toEqual('174985216');
+        ).toStrictEqual('174985216');
 
         expect(
           new Numeric('1756714320', 10)
             .minus(new Numeric('686216', 10))
             .toString(),
-        ).toEqual('1756028104');
+        ).toStrictEqual('1756028104');
 
         expect(
           new Numeric('41756714320', 10)
             .minus(new Numeric('6862160', 10))
             .toString(),
-        ).toEqual('41749852160');
+        ).toStrictEqual('41749852160');
       });
 
-      it('Should compute correct results for subtraction of negative big numbers', () => {
+      it('should compute correct results for subtraction of negative big numbers', () => {
         expect(
           new Numeric('175671432', 10).minus('-686216', 10).toString(),
-        ).toEqual('176357648');
+        ).toStrictEqual('176357648');
 
         expect(
           new Numeric('1756714320', 10)
             .minus(new Numeric('-686216', 10))
             .toString(),
-        ).toEqual('1757400536');
+        ).toStrictEqual('1757400536');
 
         expect(
           new Numeric('-41756714320', 10)
             .minus(new Numeric('-6862160', 10))
             .toString(),
-        ).toEqual('-41749852160');
+        ).toStrictEqual('-41749852160');
       });
     });
 
     describe('applyConversionRate', () => {
-      it('Should multiply the value by the conversionRate supplied', () => {
+      it('should multiply the value by the conversionRate supplied', () => {
         expect(
           new Numeric(10, 10).applyConversionRate(468.5).toString(),
-        ).toEqual('4685');
+        ).toStrictEqual('4685');
       });
 
-      it('Should multiply the value by the conversionRate supplied when conversionRate is a BigNumber', () => {
+      it('should multiply the value by the conversionRate supplied when conversionRate is a BigNumber', () => {
         expect(
           new Numeric(10, 10)
             .applyConversionRate(new BigNumber(468.5, 10))
             .toString(),
-        ).toEqual('4685');
+        ).toStrictEqual('4685');
       });
 
-      it('Should multiply the value by the inverse of conversionRate supplied when second parameter is true', () => {
+      it('should multiply the value by the inverse of conversionRate supplied when second parameter is true', () => {
         expect(
           new Numeric(10, 10).applyConversionRate(468.5, true).toString(),
-        ).toEqual('0.0213447171824973319');
+        ).toStrictEqual('0.0213447171824973319');
       });
 
-      it('Should multiply the value by the inverse of the BigNumber conversionRate supplied when second parameter is true', () => {
+      it('should multiply the value by the inverse of the BigNumber conversionRate supplied when second parameter is true', () => {
         expect(
           new Numeric(10, 10)
             .applyConversionRate(new BigNumber(468.5, 10), true)
             .toString(),
-        ).toEqual('0.0213447171824973319');
+        ).toStrictEqual('0.0213447171824973319');
       });
     });
   });
 
   describe('Base conversion', () => {
     it('should convert a hexadecimal string to a decimal string', () => {
-      expect(new Numeric('0x5208', 16).toBase(10).toString()).toEqual('21000');
+      expect(new Numeric('0x5208', 16).toBase(10).toString()).toStrictEqual(
+        '21000',
+      );
     });
 
     it('should convert a decimal string to a hexadecimal string', () => {
-      expect(new Numeric('21000', 10).toBase(16).toString()).toEqual('5208');
+      expect(new Numeric('21000', 10).toBase(16).toString()).toStrictEqual(
+        '5208',
+      );
     });
 
     it('should convert a decimal string to a 0x prefixed hexadecimal string', () => {
-      expect(new Numeric('21000', 10).toPrefixedHexString()).toEqual('0x5208');
+      expect(new Numeric('21000', 10).toPrefixedHexString()).toStrictEqual(
+        '0x5208',
+      );
     });
 
     it('should convert a decimal number to a hexadecimal string', () => {
-      expect(new Numeric(21000, 10).toBase(16).toString()).toEqual('5208');
+      expect(new Numeric(21000, 10).toBase(16).toString()).toStrictEqual(
+        '5208',
+      );
     });
 
     it('should convert a decimal number to a 0x prefixed hexadecimal string', () => {
-      expect(new Numeric(21000, 10).toPrefixedHexString()).toEqual('0x5208');
+      expect(new Numeric(21000, 10).toPrefixedHexString()).toStrictEqual(
+        '0x5208',
+      );
     });
   });
 
   describe('Comparisons', () => {
-    it('Should correctly identify that 0xa is greater than 0x9', () => {
-      expect(new Numeric('0xa', 16).greaterThan('0x9', 16)).toEqual(true);
+    it('should correctly identify that 0xa is greater than 0x9', () => {
+      expect(new Numeric('0xa', 16).greaterThan('0x9', 16)).toStrictEqual(true);
     });
-    it('Should correctly identify that 0x9 is less than 0xa', () => {
-      expect(new Numeric('0x9', 16).lessThan('0xa', 16)).toEqual(true);
+    it('should correctly identify that 0x9 is less than 0xa', () => {
+      expect(new Numeric('0x9', 16).lessThan('0xa', 16)).toStrictEqual(true);
     });
-    it('Should correctly identify that 0xa is greater than or equal to 0xa', () => {
-      expect(new Numeric('0xa', 16).greaterThanOrEqualTo('0xa', 16)).toEqual(
+    it('should correctly identify that 0xa is greater than or equal to 0xa', () => {
+      expect(
+        new Numeric('0xa', 16).greaterThanOrEqualTo('0xa', 16),
+      ).toStrictEqual(true);
+    });
+    it('should correctly identify that 0xa is less than or equal to 0xa', () => {
+      expect(new Numeric('0xa', 16).lessThanOrEqualTo('0xa', 16)).toStrictEqual(
         true,
       );
     });
-    it('Should correctly identify that 0xa is less than or equal to 0xa', () => {
-      expect(new Numeric('0xa', 16).lessThanOrEqualTo('0xa', 16)).toEqual(true);
-    });
 
-    it('Should correctly identify that 0xa is greater than 9', () => {
-      expect(new Numeric('0xa', 16).greaterThan(9, 10)).toEqual(true);
+    it('should correctly identify that 0xa is greater than 9', () => {
+      expect(new Numeric('0xa', 16).greaterThan(9, 10)).toStrictEqual(true);
     });
-    it('Should correctly identify that 0x9 is less than 10', () => {
-      expect(new Numeric('0x9', 16).lessThan(10, 10)).toEqual(true);
+    it('should correctly identify that 0x9 is less than 10', () => {
+      expect(new Numeric('0x9', 16).lessThan(10, 10)).toStrictEqual(true);
     });
-    it('Should correctly identify that 10 is greater than or equal to 0xa', () => {
-      expect(new Numeric(10, 10).greaterThanOrEqualTo('0xa', 16)).toEqual(true);
+    it('should correctly identify that 10 is greater than or equal to 0xa', () => {
+      expect(new Numeric(10, 10).greaterThanOrEqualTo('0xa', 16)).toStrictEqual(
+        true,
+      );
     });
-    it('Should correctly identify that 10 is less than or equal to 0xa', () => {
-      expect(new Numeric(10, 10).lessThanOrEqualTo('0xa', 16)).toEqual(true);
+    it('should correctly identify that 10 is less than or equal to 0xa', () => {
+      expect(new Numeric(10, 10).lessThanOrEqualTo('0xa', 16)).toStrictEqual(
+        true,
+      );
     });
   });
 
   describe('Positive and Negative determination', () => {
-    it('Should correctly identify a negative number with isNegative', () => {
-      expect(new Numeric(-10, 10).isNegative()).toEqual(true);
-      expect(new Numeric('-10', 10).isNegative()).toEqual(true);
-      expect(new Numeric('-0xa', 16).isNegative()).toEqual(true);
+    it('should correctly identify a negative number with isNegative', () => {
+      expect(new Numeric(-10, 10).isNegative()).toStrictEqual(true);
+      expect(new Numeric('-10', 10).isNegative()).toStrictEqual(true);
+      expect(new Numeric('-0xa', 16).isNegative()).toStrictEqual(true);
     });
-    it('Should return false for isNegative when number is positive', () => {
-      expect(new Numeric(10, 10).isNegative()).toEqual(false);
-      expect(new Numeric('10', 10).isNegative()).toEqual(false);
-      expect(new Numeric('0xa', 16).isNegative()).toEqual(false);
+    it('should return false for isNegative when number is positive', () => {
+      expect(new Numeric(10, 10).isNegative()).toStrictEqual(false);
+      expect(new Numeric('10', 10).isNegative()).toStrictEqual(false);
+      expect(new Numeric('0xa', 16).isNegative()).toStrictEqual(false);
     });
-    it('Should correctly identify a positive number with isPositive', () => {
-      expect(new Numeric(10, 10).isPositive()).toEqual(true);
-      expect(new Numeric('10', 10).isPositive()).toEqual(true);
-      expect(new Numeric('0xa', 16).isPositive()).toEqual(true);
+    it('should correctly identify a positive number with isPositive', () => {
+      expect(new Numeric(10, 10).isPositive()).toStrictEqual(true);
+      expect(new Numeric('10', 10).isPositive()).toStrictEqual(true);
+      expect(new Numeric('0xa', 16).isPositive()).toStrictEqual(true);
     });
-    it('Should return false for isPositive when number is negative', () => {
-      expect(new Numeric(-10, 10).isPositive()).toEqual(false);
-      expect(new Numeric('-10', 10).isPositive()).toEqual(false);
-      expect(new Numeric('-0xa', 16).isPositive()).toEqual(false);
+    it('should return false for isPositive when number is negative', () => {
+      expect(new Numeric(-10, 10).isPositive()).toStrictEqual(false);
+      expect(new Numeric('-10', 10).isPositive()).toStrictEqual(false);
+      expect(new Numeric('-0xa', 16).isPositive()).toStrictEqual(false);
     });
   });
 
   describe('Terminating functions, return values', () => {
     describe('toString', () => {
-      it('Should return a string representation of provided hex', () => {
-        expect(new Numeric('0xa', 16).toString()).toEqual('a');
+      it('should return a string representation of provided hex', () => {
+        expect(new Numeric('0xa', 16).toString()).toStrictEqual('a');
       });
 
-      it('Should return a string representation of provided decimal string', () => {
-        expect(new Numeric('10', 10).toString()).toEqual('10');
+      it('should return a string representation of provided decimal string', () => {
+        expect(new Numeric('10', 10).toString()).toStrictEqual('10');
       });
 
-      it('Should return a string representation of provided number', () => {
-        expect(new Numeric(10, 10).toString()).toEqual('10');
+      it('should return a string representation of provided number', () => {
+        expect(new Numeric(10, 10).toString()).toStrictEqual('10');
       });
 
-      it('Should return a string representation of provided float', () => {
-        expect(new Numeric(10.5, 10).toString()).toEqual('10.5');
+      it('should return a string representation of provided float', () => {
+        expect(new Numeric(10.5, 10).toString()).toStrictEqual('10.5');
       });
 
-      it('Should return a string representation of provided BigNumber', () => {
-        expect(new Numeric(new BigNumber(10, 10)).toString()).toEqual('10');
+      it('should return a string representation of provided BigNumber', () => {
+        expect(new Numeric(new BigNumber(10, 10)).toString()).toStrictEqual(
+          '10',
+        );
       });
 
-      it('Should return a string representation of provided BN', () => {
-        expect(new Numeric(new BN(10, 10)).toString()).toEqual('10');
+      it('should return a string representation of provided BN', () => {
+        expect(new Numeric(new BN(10, 10)).toString()).toStrictEqual('10');
       });
     });
 
     describe('toNumber', () => {
-      it('Should return a number representing provided hex', () => {
-        expect(new Numeric('0xa', 16).toNumber()).toEqual(10);
+      it('should return a number representing provided hex', () => {
+        expect(new Numeric('0xa', 16).toNumber()).toStrictEqual(10);
       });
 
-      it('Should return a number representation of provided decimal string', () => {
-        expect(new Numeric('10', 10).toNumber()).toEqual(10);
+      it('should return a number representation of provided decimal string', () => {
+        expect(new Numeric('10', 10).toNumber()).toStrictEqual(10);
       });
 
-      it('Should return a number representation of provided number', () => {
-        expect(new Numeric(10, 10).toNumber()).toEqual(10);
+      it('should return a number representation of provided number', () => {
+        expect(new Numeric(10, 10).toNumber()).toStrictEqual(10);
       });
 
-      it('Should return a number representation of provided float', () => {
-        expect(new Numeric(10.5, 10).toNumber()).toEqual(10.5);
+      it('should return a number representation of provided float', () => {
+        expect(new Numeric(10.5, 10).toNumber()).toStrictEqual(10.5);
       });
 
-      it('Should return a number representation of provided BigNumber', () => {
-        expect(new Numeric(new BigNumber(10, 10)).toNumber()).toEqual(10);
+      it('should return a number representation of provided BigNumber', () => {
+        expect(new Numeric(new BigNumber(10, 10)).toNumber()).toStrictEqual(10);
       });
 
-      it('Should return a number representation of provided BN', () => {
-        expect(new Numeric(new BN(10, 10)).toNumber()).toEqual(10);
+      it('should return a number representation of provided BN', () => {
+        expect(new Numeric(new BN(10, 10)).toNumber()).toStrictEqual(10);
       });
     });
 
     describe('toFixed', () => {
-      it('Should return a string representing provided hex to 2 decimal places', () => {
-        expect(new Numeric('0xa.7', 16).toFixed(2)).toEqual('10.44');
+      it('should return a string representing provided hex to 2 decimal places', () => {
+        expect(new Numeric('0xa.7', 16).toFixed(2)).toStrictEqual('10.44');
       });
 
-      it('Should return a string representation of provided decimal string to 2 decimal places', () => {
-        expect(new Numeric('10.4375', 10).toFixed(2)).toEqual('10.44');
+      it('should return a string representation of provided decimal string to 2 decimal places', () => {
+        expect(new Numeric('10.4375', 10).toFixed(2)).toStrictEqual('10.44');
       });
 
-      it('Should return a string representation of provided float to 2 decimal places', () => {
-        expect(new Numeric(10.4375, 10).toFixed(2)).toEqual('10.44');
+      it('should return a string representation of provided float to 2 decimal places', () => {
+        expect(new Numeric(10.4375, 10).toFixed(2)).toStrictEqual('10.44');
       });
 
-      it('Should return a number representation of provided BigNumber to 2 decimal places', () => {
-        expect(new Numeric(new BigNumber(10.4375, 10)).toFixed(2)).toEqual(
-          '10.44',
-        );
+      it('should return a number representation of provided BigNumber to 2 decimal places', () => {
+        expect(
+          new Numeric(new BigNumber(10.4375, 10)).toFixed(2),
+        ).toStrictEqual('10.44');
       });
     });
 
     describe('round', () => {
       it('should return number rounded', () => {
-        expect(new Numeric(10.4375, 10).round()).toEqual(
+        expect(new Numeric(10.4375, 10).round()).toStrictEqual(
           new Numeric(10.4375, 10),
         );
-        expect(new Numeric(10.4375, 10).round(0)).toEqual(new Numeric(10, 10));
-        expect(new Numeric(10.4375, 10).round(1)).toEqual(
+        expect(new Numeric(10.4375, 10).round(0)).toStrictEqual(
+          new Numeric(10, 10),
+        );
+        expect(new Numeric(10.4375, 10).round(1)).toStrictEqual(
           new Numeric(10.4, 10),
         );
-        expect(new Numeric(10.4375, 10).round(2)).toEqual(
+        expect(new Numeric(10.4375, 10).round(2)).toStrictEqual(
           new Numeric(10.44, 10),
         );
-        expect(new Numeric(10.4375, 10).round(3)).toEqual(
+        expect(new Numeric(10.4375, 10).round(3)).toStrictEqual(
           new Numeric(10.437, 10),
         );
-        expect(new Numeric(10.4375, 10).round(4)).toEqual(
+        expect(new Numeric(10.4375, 10).round(4)).toStrictEqual(
           new Numeric(10.4375, 10),
         );
-        expect(new Numeric(10.4375, 10).round(5)).toEqual(
+        expect(new Numeric(10.4375, 10).round(5)).toStrictEqual(
           new Numeric(10.4375, 10),
         );
       });
diff --git a/shared/modules/error.test.ts b/shared/modules/error.test.ts
index 5f1d3eee6..247ef302d 100644
--- a/shared/modules/error.test.ts
+++ b/shared/modules/error.test.ts
@@ -3,11 +3,11 @@ import { isErrorWithMessage, logErrorWithMessage } from './error';
 
 jest.mock('loglevel');
 
-afterEach(() => {
-  jest.resetAllMocks();
-});
-
 describe('error module', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
   describe('isErrorWithMessage', () => {
     it('returns true when passed an instance of an Error', () => {
       expect(isErrorWithMessage(new Error('test'))).toBe(true);
@@ -21,12 +21,12 @@ describe('error module', () => {
   describe('logErrorWithMessage', () => {
     it('calls loglevel.error with the error.message when passed an instance of Error', () => {
       logErrorWithMessage(new Error('test'));
-      expect(log.error).toBeCalledWith('test');
+      expect(log.error).toHaveBeenCalledWith('test');
     });
 
     it('calls loglevel.error with the parameter passed in when parameter is not an instance of Error', () => {
       logErrorWithMessage({ test: 'test' });
-      expect(log.error).toBeCalledWith({ test: 'test' });
+      expect(log.error).toHaveBeenCalledWith({ test: 'test' });
     });
   });
 });

From a28256ace44aeafcdebbb900d77a1d116c70e2cb Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Fri, 31 Mar 2023 00:03:35 +0400
Subject: [PATCH 100/129] Change api used for opensea validation (#18383)

* Change api used for opensea validation

* fix build
---
 app/scripts/lib/security-provider-helpers.js | 4 +---
 test/e2e/tests/security-provider.spec.js     | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/scripts/lib/security-provider-helpers.js b/app/scripts/lib/security-provider-helpers.js
index b05c9a40b..986165cd9 100644
--- a/app/scripts/lib/security-provider-helpers.js
+++ b/app/scripts/lib/security-provider-helpers.js
@@ -51,17 +51,15 @@ export async function securityProviderCheck(
   }
 
   const response = await fetchWithTimeout(
-    'https://eos9d7dmfj.execute-api.us-east-1.amazonaws.com/metamask/validate',
+    'https://proxy.metafi.codefi.network/opensea/security/v1/validate',
     {
       method: 'POST',
       headers: {
         Accept: 'application/json',
         'Content-Type': 'application/json',
-        'X-API-KEY': 'NKYIN6cXkFaNnVIfzNx7s1z0p3b0B4SB6k29qA7n',
       },
       body: JSON.stringify(dataToValidate),
     },
   );
-
   return await response.json();
 }
diff --git a/test/e2e/tests/security-provider.spec.js b/test/e2e/tests/security-provider.spec.js
index 24dc00e54..df0ff4390 100644
--- a/test/e2e/tests/security-provider.spec.js
+++ b/test/e2e/tests/security-provider.spec.js
@@ -3,7 +3,8 @@ const { convertToHexValue, withFixtures } = require('../helpers');
 const FixtureBuilder = require('../fixture-builder');
 
 const OPENSEA_URL =
-  'https://eos9d7dmfj.execute-api.us-east-1.amazonaws.com/metamask/validate';
+  'https://proxy.metafi.codefi.network/opensea/security/v1/validate';
+
 /**
  * @param {import('mockttp').Mockttp} mockServer - The mock server.
  */

From a53b9fb48916c8d51426e7eaad284e29b1be938c Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Thu, 30 Mar 2023 23:57:28 +0200
Subject: [PATCH 101/129] [FLASK] `snaps-monorepo@0.32.2` (#18371)

* snaps-monorepo@0.32.0

* Update LavaMoat policies

* Add JsonSnapRegistry

* Fix lint

* [FLASK] Handle side-effects changes in metamask-controller (#18373)

* Update PermissionController

* Fix lint

* Update iframe-execution-environment

* snaps-monorepo@0.32.1

* Bump test-snaps

* Update version assertion

* Update URLs

* Fix lint

* snaps-monorepo@0.32.2

---------

Co-authored-by: Guillaume Roux <guillaumeroux123@gmail.com>
---
 app/scripts/metamask-controller.js      |  44 ++++--
 lavamoat/browserify/beta/policy.json    |  54 ++++++--
 lavamoat/browserify/desktop/policy.json | 122 ++++++++---------
 lavamoat/browserify/flask/policy.json   | 122 ++++++++---------
 lavamoat/browserify/main/policy.json    |  54 ++++++--
 package.json                            |  10 +-
 test/e2e/snaps/enums.js                 |   2 +-
 test/e2e/snaps/test-snap-update.spec.js |   2 +-
 yarn.lock                               | 170 ++++++++++++------------
 9 files changed, 327 insertions(+), 253 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 70b05b8fe..0f201d55e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -56,6 +56,7 @@ import SmartTransactionsController from '@metamask/smart-transactions-controller
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 import {
   CronjobController,
+  JsonSnapsRegistry,
   SnapController,
   IframeExecutionService,
 } from '@metamask/snaps-controllers';
@@ -701,6 +702,8 @@ export default class MetamaskController extends EventEmitter {
           `${this.approvalController.name}:hasRequest`,
           `${this.approvalController.name}:acceptRequest`,
           `${this.approvalController.name}:rejectRequest`,
+          `SnapController:getPermitted`,
+          `SnapController:install`,
         ],
       }),
       state: initState.PermissionController,
@@ -760,9 +763,7 @@ export default class MetamaskController extends EventEmitter {
 
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     const snapExecutionServiceArgs = {
-      iframeUrl: new URL(
-        'https://metamask.github.io/iframe-execution-environment/0.14.0',
-      ),
+      iframeUrl: new URL('https://execution.metamask.io/0.15.1/index.html'),
       messenger: this.controllerMessenger.getRestricted({
         name: 'ExecutionService',
       }),
@@ -800,6 +801,8 @@ export default class MetamaskController extends EventEmitter {
         'ExecutionService:terminateSnap',
         'ExecutionService:terminateAllSnaps',
         'ExecutionService:handleRpcRequest',
+        'SnapsRegistry:get',
+        'SnapsRegistry:getMetadata',
       ],
     });
 
@@ -858,7 +861,6 @@ export default class MetamaskController extends EventEmitter {
         },
       },
     });
-    // --- Snaps Cronjob Controller configuration
     const cronjobControllerMessenger = this.controllerMessenger.getRestricted({
       name: 'CronjobController',
       allowedEvents: [
@@ -877,6 +879,24 @@ export default class MetamaskController extends EventEmitter {
       messenger: cronjobControllerMessenger,
     });
 
+    const snapsRegistryMessenger = this.controllerMessenger.getRestricted({
+      name: 'SnapsRegistry',
+      allowedEvents: [],
+      allowedActions: [],
+    });
+    this.snapsRegistry = new JsonSnapsRegistry({
+      state: initState.SnapsRegistry,
+      messenger: snapsRegistryMessenger,
+      refetchOnAllowlistMiss: isMain,
+      failOnUnavailableRegistry: isMain,
+      url: {
+        registry: 'https://acl.execution.metamask.io/latest/registry.json',
+        signature: 'https://acl.execution.metamask.io/latest/signature.json',
+      },
+      publicKey:
+        '0x025b65308f0f0fb8bc7f7ff87bfc296e0330eee5d3c1d1ee4a048b2fd6a86fa0a6',
+    });
+
     this.desktopController = new DesktopController({
       initState: initState.DesktopController,
     });
@@ -1259,6 +1279,7 @@ export default class MetamaskController extends EventEmitter {
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
       SnapController: this.snapController,
       CronjobController: this.cronjobController,
+      SnapsRegistry: this.snapsRegistry,
       NotificationController: this.notificationController,
       DesktopController: this.desktopController.store,
       ///: END:ONLY_INCLUDE_IN
@@ -1292,6 +1313,7 @@ export default class MetamaskController extends EventEmitter {
         ///: BEGIN:ONLY_INCLUDE_IN(flask)
         SnapController: this.snapController,
         CronjobController: this.cronjobController,
+        SnapsRegistry: this.snapsRegistry,
         NotificationController: this.notificationController,
         DesktopController: this.desktopController.store,
         ///: END:ONLY_INCLUDE_IN
@@ -3866,15 +3888,11 @@ export default class MetamaskController extends EventEmitter {
           'SnapController:getPermitted',
           origin,
         ),
-        requestPermissions: async (requestedPermissions) => {
-          const [approvedPermissions] =
-            await this.permissionController.requestPermissions(
-              { origin },
-              requestedPermissions,
-            );
-
-          return Object.values(approvedPermissions);
-        },
+        requestPermissions: async (requestedPermissions) =>
+          await this.permissionController.requestPermissions(
+            { origin },
+            requestedPermissions,
+          ),
         getPermissions: this.permissionController.getPermissions.bind(
           this.permissionController,
           origin,
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 7d933f82d..cf463cda4 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1295,6 +1295,8 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/message-manager>@metamask/controller-utils>@metamask/utils": true,
+        "@spruceid/siwe-parser": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
@@ -1302,6 +1304,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/message-manager>@metamask/controller-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/message-manager>jsonschema": {
       "packages": {
         "browserify>url": true
@@ -1331,8 +1345,11 @@
       }
     },
     "@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
@@ -1341,6 +1358,11 @@
         "json-rpc-engine": true
       }
     },
+    "@metamask/permission-controller>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/permission-controller>@metamask/controller-utils": {
       "globals": {
         "console.error": true,
@@ -1348,7 +1370,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/controller-utils>isomorphic-fetch": true,
+        "@metamask/permission-controller>@metamask/controller-utils>@metamask/utils": true,
+        "@spruceid/siwe-parser": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
@@ -1356,6 +1379,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/permission-controller>@metamask/controller-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1533,7 +1568,15 @@
       "packages": {
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
       }
     },
     "@ngraveio/bc-ur": {
@@ -2579,11 +2622,6 @@
         "document.createElement": true
       }
     },
-    "btoa": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
     "classnames": {
       "globals": {
         "classNames": "write",
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 46ce15ef8..c2acd56f3 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1349,6 +1349,8 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/message-manager>@metamask/controller-utils>@metamask/utils": true,
+        "@spruceid/siwe-parser": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
@@ -1356,6 +1358,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/message-manager>@metamask/controller-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/message-manager>jsonschema": {
       "packages": {
         "browserify>url": true
@@ -1397,8 +1411,11 @@
       }
     },
     "@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
@@ -1407,6 +1424,11 @@
         "json-rpc-engine": true
       }
     },
+    "@metamask/permission-controller>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/permission-controller>@metamask/controller-utils": {
       "globals": {
         "console.error": true,
@@ -1414,7 +1436,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/controller-utils>isomorphic-fetch": true,
+        "@metamask/permission-controller>@metamask/controller-utils>@metamask/utils": true,
+        "@spruceid/siwe-parser": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
@@ -1422,6 +1445,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/permission-controller>@metamask/controller-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1461,6 +1496,7 @@
     },
     "@metamask/post-message-stream": {
       "globals": {
+        "MessageEvent.prototype": true,
         "WorkerGlobalScope": true,
         "addEventListener": true,
         "browser": true,
@@ -1545,8 +1581,8 @@
       "packages": {
         "@metamask/key-tree": true,
         "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/permission-controller": true,
         "@metamask/rpc-methods>@metamask/browser-passworder": true,
-        "@metamask/rpc-methods>@metamask/permission-controller": true,
         "@metamask/rpc-methods>nanoid": true,
         "@metamask/snaps-ui": true,
         "@metamask/snaps-utils": true,
@@ -1569,36 +1605,6 @@
         "browserify>buffer": true
       }
     },
-    "@metamask/rpc-methods>@metamask/permission-controller": {
-      "packages": {
-        "@metamask/rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/rpc-methods>nanoid": true,
-        "deep-freeze-strict": true,
-        "eth-rpc-errors": true,
-        "immer": true,
-        "json-rpc-engine": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/permission-controller>@metamask/controller-utils": {
-      "globals": {
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true,
-        "ethjs>ethjs-unit": true
-      }
-    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1656,11 +1662,11 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/object-multiplex": true,
         "@metamask/rpc-methods": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@metamask/subject-metadata-controller": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
@@ -1669,6 +1675,7 @@
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-utils": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -1681,31 +1688,6 @@
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/base-controller>@metamask/controller-utils": {
-      "globals": {
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true,
-        "ethjs>ethjs-unit": true
-      }
-    },
-    "@metamask/snaps-controllers>@metamask/permission-controller": {
-      "packages": {
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/base-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>nanoid": true,
-        "deep-freeze-strict": true,
-        "eth-rpc-errors": true,
-        "immer": true,
-        "json-rpc-engine": true
-      }
-    },
     "@metamask/snaps-controllers>@metamask/subject-metadata-controller": {
       "packages": {
         "@metamask/snaps-controllers>@metamask/base-controller": true
@@ -1885,6 +1867,13 @@
         "semver": true
       }
     },
+    "@metamask/snaps-utils>@metamask/snaps-registry": {
+      "packages": {
+        "@metamask/key-tree>@noble/secp256k1": true,
+        "@metamask/utils": true,
+        "@metamask/utils>superstruct": true
+      }
+    },
     "@metamask/snaps-utils>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -1974,7 +1963,15 @@
       "packages": {
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
       }
     },
     "@ngraveio/bc-ur": {
@@ -3020,11 +3017,6 @@
         "document.createElement": true
       }
     },
-    "btoa": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
     "classnames": {
       "globals": {
         "classNames": "write",
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 46ce15ef8..c2acd56f3 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1349,6 +1349,8 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/message-manager>@metamask/controller-utils>@metamask/utils": true,
+        "@spruceid/siwe-parser": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
@@ -1356,6 +1358,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/message-manager>@metamask/controller-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/message-manager>jsonschema": {
       "packages": {
         "browserify>url": true
@@ -1397,8 +1411,11 @@
       }
     },
     "@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
@@ -1407,6 +1424,11 @@
         "json-rpc-engine": true
       }
     },
+    "@metamask/permission-controller>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/permission-controller>@metamask/controller-utils": {
       "globals": {
         "console.error": true,
@@ -1414,7 +1436,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/controller-utils>isomorphic-fetch": true,
+        "@metamask/permission-controller>@metamask/controller-utils>@metamask/utils": true,
+        "@spruceid/siwe-parser": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
@@ -1422,6 +1445,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/permission-controller>@metamask/controller-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1461,6 +1496,7 @@
     },
     "@metamask/post-message-stream": {
       "globals": {
+        "MessageEvent.prototype": true,
         "WorkerGlobalScope": true,
         "addEventListener": true,
         "browser": true,
@@ -1545,8 +1581,8 @@
       "packages": {
         "@metamask/key-tree": true,
         "@metamask/key-tree>@noble/hashes": true,
+        "@metamask/permission-controller": true,
         "@metamask/rpc-methods>@metamask/browser-passworder": true,
-        "@metamask/rpc-methods>@metamask/permission-controller": true,
         "@metamask/rpc-methods>nanoid": true,
         "@metamask/snaps-ui": true,
         "@metamask/snaps-utils": true,
@@ -1569,36 +1605,6 @@
         "browserify>buffer": true
       }
     },
-    "@metamask/rpc-methods>@metamask/permission-controller": {
-      "packages": {
-        "@metamask/rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
-        "@metamask/rpc-methods>nanoid": true,
-        "deep-freeze-strict": true,
-        "eth-rpc-errors": true,
-        "immer": true,
-        "json-rpc-engine": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/permission-controller>@metamask/controller-utils": {
-      "globals": {
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true,
-        "ethjs>ethjs-unit": true
-      }
-    },
     "@metamask/rpc-methods>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1656,11 +1662,11 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/object-multiplex": true,
         "@metamask/rpc-methods": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@metamask/subject-metadata-controller": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
@@ -1669,6 +1675,7 @@
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-utils": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
@@ -1681,31 +1688,6 @@
         "immer": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/base-controller>@metamask/controller-utils": {
-      "globals": {
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true,
-        "ethereumjs-util": true,
-        "ethjs>ethjs-unit": true
-      }
-    },
-    "@metamask/snaps-controllers>@metamask/permission-controller": {
-      "packages": {
-        "@metamask/snaps-controllers>@metamask/base-controller": true,
-        "@metamask/snaps-controllers>@metamask/base-controller>@metamask/controller-utils": true,
-        "@metamask/snaps-controllers>nanoid": true,
-        "deep-freeze-strict": true,
-        "eth-rpc-errors": true,
-        "immer": true,
-        "json-rpc-engine": true
-      }
-    },
     "@metamask/snaps-controllers>@metamask/subject-metadata-controller": {
       "packages": {
         "@metamask/snaps-controllers>@metamask/base-controller": true
@@ -1885,6 +1867,13 @@
         "semver": true
       }
     },
+    "@metamask/snaps-utils>@metamask/snaps-registry": {
+      "packages": {
+        "@metamask/key-tree>@noble/secp256k1": true,
+        "@metamask/utils": true,
+        "@metamask/utils>superstruct": true
+      }
+    },
     "@metamask/snaps-utils>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -1974,7 +1963,15 @@
       "packages": {
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
       }
     },
     "@ngraveio/bc-ur": {
@@ -3020,11 +3017,6 @@
         "document.createElement": true
       }
     },
-    "btoa": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
     "classnames": {
       "globals": {
         "classNames": "write",
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 7d933f82d..cf463cda4 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1295,6 +1295,8 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/message-manager>@metamask/controller-utils>@metamask/utils": true,
+        "@spruceid/siwe-parser": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
@@ -1302,6 +1304,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/message-manager>@metamask/controller-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/message-manager>jsonschema": {
       "packages": {
         "browserify>url": true
@@ -1331,8 +1345,11 @@
       }
     },
     "@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
       "packages": {
-        "@metamask/base-controller": true,
+        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
@@ -1341,6 +1358,11 @@
         "json-rpc-engine": true
       }
     },
+    "@metamask/permission-controller>@metamask/base-controller": {
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/permission-controller>@metamask/controller-utils": {
       "globals": {
         "console.error": true,
@@ -1348,7 +1370,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/controller-utils>isomorphic-fetch": true,
+        "@metamask/permission-controller>@metamask/controller-utils>@metamask/utils": true,
+        "@spruceid/siwe-parser": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
@@ -1356,6 +1379,18 @@
         "ethjs>ethjs-unit": true
       }
     },
+    "@metamask/permission-controller>@metamask/controller-utils>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>superstruct": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1533,7 +1568,15 @@
       "packages": {
         "@metamask/key-tree>@noble/hashes": true,
         "@metamask/key-tree>@scure/base": true,
-        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true
+        "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true
+      }
+    },
+    "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": {
+      "globals": {
+        "crypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
       }
     },
     "@ngraveio/bc-ur": {
@@ -2579,11 +2622,6 @@
         "document.createElement": true
       }
     },
-    "btoa": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
     "classnames": {
       "globals": {
         "classNames": "write",
diff --git a/package.json b/package.json
index ec9321133..b0cdf96a7 100644
--- a/package.json
+++ b/package.json
@@ -247,18 +247,18 @@
     "@metamask/metamask-eth-abis": "^3.0.0",
     "@metamask/notification-controller": "^1.0.0",
     "@metamask/obs-store": "^5.0.0",
-    "@metamask/permission-controller": "^2.0.0",
+    "@metamask/permission-controller": "^3.1.0",
     "@metamask/phishing-controller": "^2.0.0",
     "@metamask/post-message-stream": "^6.0.0",
     "@metamask/providers": "^10.2.1",
     "@metamask/rate-limit-controller": "^1.0.0",
-    "@metamask/rpc-methods": "^0.31.0",
+    "@metamask/rpc-methods": "^0.32.2",
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/slip44": "^2.1.0",
     "@metamask/smart-transactions-controller": "^3.1.0",
-    "@metamask/snaps-controllers": "^0.31.0",
-    "@metamask/snaps-ui": "^0.31.0",
-    "@metamask/snaps-utils": "^0.31.0",
+    "@metamask/snaps-controllers": "^0.32.2",
+    "@metamask/snaps-ui": "^0.32.2",
+    "@metamask/snaps-utils": "^0.32.2",
     "@metamask/subject-metadata-controller": "^1.0.0",
     "@metamask/utils": "^5.0.0",
     "@ngraveio/bc-ur": "^1.1.6",
diff --git a/test/e2e/snaps/enums.js b/test/e2e/snaps/enums.js
index c9dccd198..ec89f5314 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/test-snaps/5.1.0/',
+  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/test-snaps/5.1.2/',
 };
diff --git a/test/e2e/snaps/test-snap-update.spec.js b/test/e2e/snaps/test-snap-update.spec.js
index eaf0b847c..aff7214d4 100644
--- a/test/e2e/snaps/test-snap-update.spec.js
+++ b/test/e2e/snaps/test-snap-update.spec.js
@@ -127,7 +127,7 @@ describe('Test Snap update', function () {
         // look for the correct version text
         const versionResult = await driver.findElement('#updateSnapVersion');
         await driver.delay(1000);
-        assert.equal(await versionResult.getText(), '"5.0.1"');
+        assert.equal(await versionResult.getText(), '"5.1.2"');
       },
     );
   });
diff --git a/yarn.lock b/yarn.lock
index 6ea77ae8f..e1de27f68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3595,7 +3595,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/approval-controller@npm:^1.0.0, @metamask/approval-controller@npm:^1.0.1, @metamask/approval-controller@npm:^1.1.0":
+"@metamask/approval-controller@npm:^1.0.0, @metamask/approval-controller@npm:^1.0.1":
   version: 1.1.0
   resolution: "@metamask/approval-controller@npm:1.1.0"
   dependencies:
@@ -3739,16 +3739,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/controller-utils@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@metamask/controller-utils@npm:3.0.0"
+"@metamask/controller-utils@npm:^3.0.0, @metamask/controller-utils@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@metamask/controller-utils@npm:3.1.0"
   dependencies:
+    "@metamask/utils": ^3.3.1
+    "@spruceid/siwe-parser": 1.1.3
     eth-ens-namehash: ^2.0.8
     eth-rpc-errors: ^4.0.0
     ethereumjs-util: ^7.0.10
     ethjs-unit: ^0.1.6
     fast-deep-equal: ^3.1.3
-  checksum: 44227aa9f716f86373a1a4fb86b7ae1c51199dd819f30a3a310a9f87838b7e11c1a3bb024572253bd3cb0258281596cfab8fbf317c3fe90962fa6cf426aa6858
+  checksum: 811fc4b9da98ca406a0e002c87933687e745d20f802305bb2af0affcdad454189c705caae9389444da1f5f88f2d10269b3ae8354aa1f600a11ddb9315cfa5718
   languageName: node
   linkType: hard
 
@@ -4168,33 +4170,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/permission-controller@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@metamask/permission-controller@npm:2.0.0"
-  dependencies:
-    "@metamask/approval-controller": ^1.1.0
-    "@metamask/base-controller": ^1.1.2
-    "@metamask/controller-utils": ^2.0.0
-    "@metamask/types": ^1.1.0
-    "@types/deep-freeze-strict": ^1.1.0
-    deep-freeze-strict: ^1.1.1
-    eth-rpc-errors: ^4.0.0
-    immer: ^9.0.6
-    json-rpc-engine: ^6.1.0
-    nanoid: ^3.1.31
-  peerDependencies:
-    "@metamask/approval-controller": ^1.1.0
-  checksum: 152be8429ceebf7dfbd415ff12746ee9c0216fa4dfb90f825532fd216f6b2aa66061748fb0685ec23ad6bde21212c6ccd32a4219b803913d45b70f8ded45ac2e
-  languageName: node
-  linkType: hard
-
-"@metamask/permission-controller@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@metamask/permission-controller@npm:3.0.0"
+"@metamask/permission-controller@npm:^3.0.0, @metamask/permission-controller@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@metamask/permission-controller@npm:3.1.0"
   dependencies:
     "@metamask/approval-controller": ^2.0.0
     "@metamask/base-controller": ^2.0.0
-    "@metamask/controller-utils": ^3.0.0
+    "@metamask/controller-utils": ^3.1.0
     "@metamask/types": ^1.1.0
     "@types/deep-freeze-strict": ^1.1.0
     deep-freeze-strict: ^1.1.1
@@ -4204,7 +4186,7 @@ __metadata:
     nanoid: ^3.1.31
   peerDependencies:
     "@metamask/approval-controller": ^2.0.0
-  checksum: 67e104d21b3f0258863ecaabd11cb587f10dbcc91ff9b081d8b9569d163d6d54dd5b8fb267d5416ab8e41c8c48b5103e92e013fd1916d492b72706cda2474962
+  checksum: 91c615e2faf9c1ce16371602e99354178d79a0af0697f1c3c81c860c2e9972f23e8189290cd41423c3df3048906bbf55c01fef8326677f2ea5cbcfdfb6a58db6
   languageName: node
   linkType: hard
 
@@ -4239,13 +4221,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/post-message-stream@npm:^6.0.0, @metamask/post-message-stream@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "@metamask/post-message-stream@npm:6.1.0"
+"@metamask/post-message-stream@npm:^6.0.0, @metamask/post-message-stream@npm:^6.1.1":
+  version: 6.1.1
+  resolution: "@metamask/post-message-stream@npm:6.1.1"
   dependencies:
-    "@metamask/utils": ^3.0.1
+    "@metamask/utils": ^4.0.0
     readable-stream: 2.3.3
-  checksum: 2503f3fbce7f9c8372ccc429253688f296876ccb83e7c55e8cbc512e7004d84555f111c75c0f81444a6f8148533a86d537bffa9fad9b5c8b13727615a96b32fe
+  checksum: 588988d555ff20e0d60ed2de71e804d96963a9d4c07716901d5ae13100eb0f97c49eb6b2dbd93ac408098067c0e12cbfca90fed345fecdb69c92e852ab28c0b4
   languageName: node
   linkType: hard
 
@@ -4290,22 +4272,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/rpc-methods@npm:^0.31.0":
-  version: 0.31.0
-  resolution: "@metamask/rpc-methods@npm:0.31.0"
+"@metamask/rpc-methods@npm:^0.32.2":
+  version: 0.32.2
+  resolution: "@metamask/rpc-methods@npm:0.32.2"
   dependencies:
     "@metamask/browser-passworder": ^4.0.2
     "@metamask/key-tree": ^7.0.0
-    "@metamask/permission-controller": ^3.0.0
-    "@metamask/snaps-ui": ^0.31.0
-    "@metamask/snaps-utils": ^0.31.0
+    "@metamask/permission-controller": ^3.1.0
+    "@metamask/snaps-ui": ^0.32.2
+    "@metamask/snaps-utils": ^0.32.2
     "@metamask/types": ^1.1.0
     "@metamask/utils": ^5.0.0
     "@noble/hashes": ^1.1.3
     eth-rpc-errors: ^4.0.2
     nanoid: ^3.1.31
     superstruct: ^1.0.3
-  checksum: 73e7271279a3eff43f5bca46343d582a3f90f2eda3c8e4dcfc46e01f097be2222decf8a4d66aee3a8fc4fdc1b15de176460ea0f2a87ec99889a2c5456800879c
+  checksum: 11a996de95c64ef26e22fcd276a04e7ef93e1cd8ef279bea46a6293c7c0e714f22c417ebd92ca50fca505aaf4c68bcaf818466c24cdc93c77afad9842a50f394
   languageName: node
   linkType: hard
 
@@ -4352,19 +4334,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^0.31.0":
-  version: 0.31.0
-  resolution: "@metamask/snaps-controllers@npm:0.31.0"
+"@metamask/snaps-controllers@npm:^0.32.2":
+  version: 0.32.2
+  resolution: "@metamask/snaps-controllers@npm:0.32.2"
   dependencies:
     "@metamask/approval-controller": ^2.0.0
     "@metamask/base-controller": ^2.0.0
     "@metamask/object-multiplex": ^1.1.0
-    "@metamask/permission-controller": ^3.0.0
-    "@metamask/post-message-stream": ^6.1.0
-    "@metamask/rpc-methods": ^0.31.0
-    "@metamask/snaps-execution-environments": ^0.31.0
-    "@metamask/snaps-registry": ^1.1.1
-    "@metamask/snaps-utils": ^0.31.0
+    "@metamask/permission-controller": ^3.1.0
+    "@metamask/post-message-stream": ^6.1.1
+    "@metamask/rpc-methods": ^0.32.2
+    "@metamask/snaps-execution-environments": ^0.32.2
+    "@metamask/snaps-registry": ^1.2.0
+    "@metamask/snaps-utils": ^0.32.2
     "@metamask/subject-metadata-controller": ^2.0.0
     "@metamask/utils": ^5.0.0
     "@xstate/fsm": ^2.0.0
@@ -4379,19 +4361,19 @@ __metadata:
     pump: ^3.0.0
     readable-web-to-node-stream: ^3.0.2
     tar-stream: ^2.2.0
-  checksum: 6e3a69216a3dbcdef7702caf60795bd7bc25169e491d695a14638c0ce67dcfc67e509f8f29604d974d23cc132edf933e16d2859d4502455e805a2ffd9a366d12
+  checksum: f3994b4245d74f324b83ffb5ce2879201b77ea4916d46c5d20fba49d21d8cf10ff74252b0c0e29215587e67a94b18e2c2d6bbeac934ec669d3e56eeabae5b04f
   languageName: node
   linkType: hard
 
-"@metamask/snaps-execution-environments@npm:^0.31.0":
-  version: 0.31.0
-  resolution: "@metamask/snaps-execution-environments@npm:0.31.0"
+"@metamask/snaps-execution-environments@npm:^0.32.2":
+  version: 0.32.2
+  resolution: "@metamask/snaps-execution-environments@npm:0.32.2"
   dependencies:
     "@metamask/object-multiplex": ^1.2.0
-    "@metamask/post-message-stream": ^6.1.0
+    "@metamask/post-message-stream": ^6.1.1
     "@metamask/providers": ^10.2.0
-    "@metamask/rpc-methods": ^0.31.0
-    "@metamask/snaps-utils": ^0.31.0
+    "@metamask/rpc-methods": ^0.32.2
+    "@metamask/snaps-utils": ^0.32.2
     "@metamask/utils": ^5.0.0
     eth-rpc-errors: ^4.0.3
     json-rpc-engine: ^6.1.0
@@ -4399,40 +4381,42 @@ __metadata:
     ses: ^0.18.1
     stream-browserify: ^3.0.0
     superstruct: ^1.0.3
-  checksum: 114b8370980868e3a8db650a9cac35a31f063d82621bbc7e052157a54ee96b60c26db260bcac904813b751fec103da5fe74af061d0c7dd3fb6c50dd975258350
+  checksum: 10d5d727dea00628c0644ab639bd734b9fb793cdc01ebe5d1101db3041de54b854acc8f935ec8acff134fa12a5713c038c466c2f2813b038dd1eea84d700856f
   languageName: node
   linkType: hard
 
-"@metamask/snaps-registry@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "@metamask/snaps-registry@npm:1.1.1"
+"@metamask/snaps-registry@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@metamask/snaps-registry@npm:1.2.0"
+  dependencies:
+    "@metamask/utils": ^5.0.0
+    "@noble/secp256k1": ^1.7.1
+    superstruct: ^1.0.3
+  checksum: d0534680e713ca94e41cbb86f5f700aaf8c1f36b88fc1ed24b4669f11f8583b6d949f6724b8d9fd518a6210131af4ea7822e73ce34e64649dbe29a28850c6682
+  languageName: node
+  linkType: hard
+
+"@metamask/snaps-ui@npm:^0.32.2":
+  version: 0.32.2
+  resolution: "@metamask/snaps-ui@npm:0.32.2"
   dependencies:
     "@metamask/utils": ^5.0.0
     superstruct: ^1.0.3
-  checksum: 1e77c30af2955baf559160c1098f79a042196b23cd691448668672b4c8c3d92a0602061ab4c4f05b2f60310cfd81147c5e87ce80da6d4a48e45765d569132a77
+  checksum: 98e8900efb63a0f1ec4893624290a1bf2d0fa416f99d57f33532865063f4e4b9b3787b77630629c64d7dc041e3508cac81044eca067ed76a07aa380bc5997db2
   languageName: node
   linkType: hard
 
-"@metamask/snaps-ui@npm:^0.31.0":
-  version: 0.31.0
-  resolution: "@metamask/snaps-ui@npm:0.31.0"
-  dependencies:
-    "@metamask/utils": ^5.0.0
-    superstruct: ^1.0.3
-  checksum: b4d7df0e3f3bd28c8cb958c72143d442c44f0ca4f02e226725b804e9f24c1d9a0f7d1d46818adb2969651d4a4626b57a80e669c9867f0dc3335fd85cf458c9a3
-  languageName: node
-  linkType: hard
-
-"@metamask/snaps-utils@npm:^0.31.0":
-  version: 0.31.0
-  resolution: "@metamask/snaps-utils@npm:0.31.0"
+"@metamask/snaps-utils@npm:^0.32.2":
+  version: 0.32.2
+  resolution: "@metamask/snaps-utils@npm:0.32.2"
   dependencies:
     "@babel/core": ^7.18.6
     "@babel/types": ^7.18.7
-    "@metamask/permission-controller": ^3.0.0
+    "@metamask/base-controller": ^2.0.0
+    "@metamask/permission-controller": ^3.1.0
     "@metamask/providers": ^10.2.1
-    "@metamask/snaps-registry": ^1.1.1
-    "@metamask/snaps-ui": ^0.31.0
+    "@metamask/snaps-registry": ^1.2.0
+    "@metamask/snaps-ui": ^0.32.2
     "@metamask/utils": ^5.0.0
     "@noble/hashes": ^1.1.3
     "@scure/base": ^1.1.1
@@ -4445,7 +4429,7 @@ __metadata:
     ses: ^0.18.1
     superstruct: ^1.0.3
     validate-npm-package-name: ^5.0.0
-  checksum: 007dc6e08989b0a197cc84d95b29a194c3408a2f9e822a42c2060a1c842ff10c737cf8f5f0e8f8178a7ea7f98565cfc8e16eaa9181331b50b5dc13c3a80655cd
+  checksum: 3568fb79cff8283eacb6e1bd498e20191f2c7c6774675be372f5305a4b5275512d1ded2a9fb36c106a8b10c5cbf480f6a87cdacfc70baf642b9bf3094ee3aefa
   languageName: node
   linkType: hard
 
@@ -4499,6 +4483,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/utils@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@metamask/utils@npm:4.0.0"
+  dependencies:
+    "@types/debug": ^4.1.7
+    debug: ^4.3.4
+    semver: ^7.3.8
+    superstruct: ^1.0.3
+  checksum: 6d4edca78fe1f66504ed5e5ca021a67f4b4e0893e86484c746b87039c2161c39d3b8bd8e4b9235ddfd023b2d76dd54210af94ec5550e27bc4ad9c0d7d5f3f231
+  languageName: node
+  linkType: hard
+
 "@metamask/utils@npm:^5.0.0":
   version: 5.0.0
   resolution: "@metamask/utils@npm:5.0.0"
@@ -4572,7 +4568,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/secp256k1@npm:^1.5.5, @noble/secp256k1@npm:^1.7.0":
+"@noble/secp256k1@npm:^1.5.5, @noble/secp256k1@npm:^1.7.0, @noble/secp256k1@npm:^1.7.1":
   version: 1.7.1
   resolution: "@noble/secp256k1@npm:1.7.1"
   checksum: d2301f1f7690368d8409a3152450458f27e54df47e3f917292de3de82c298770890c2de7c967d237eff9c95b70af485389a9695f73eb05a43e2bd562d18b18cb
@@ -5104,7 +5100,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@spruceid/siwe-parser@npm:^1.1.3":
+"@spruceid/siwe-parser@npm:1.1.3, @spruceid/siwe-parser@npm:^1.1.3":
   version: 1.1.3
   resolution: "@spruceid/siwe-parser@npm:1.1.3"
   dependencies:
@@ -24294,19 +24290,19 @@ __metadata:
     "@metamask/metamask-eth-abis": ^3.0.0
     "@metamask/notification-controller": ^1.0.0
     "@metamask/obs-store": ^5.0.0
-    "@metamask/permission-controller": ^2.0.0
+    "@metamask/permission-controller": ^3.1.0
     "@metamask/phishing-controller": ^2.0.0
     "@metamask/phishing-warning": ^2.0.1
     "@metamask/post-message-stream": ^6.0.0
     "@metamask/providers": ^10.2.1
     "@metamask/rate-limit-controller": ^1.0.0
-    "@metamask/rpc-methods": ^0.31.0
+    "@metamask/rpc-methods": ^0.32.2
     "@metamask/scure-bip39": ^2.0.3
     "@metamask/slip44": ^2.1.0
     "@metamask/smart-transactions-controller": ^3.1.0
-    "@metamask/snaps-controllers": ^0.31.0
-    "@metamask/snaps-ui": ^0.31.0
-    "@metamask/snaps-utils": ^0.31.0
+    "@metamask/snaps-controllers": ^0.32.2
+    "@metamask/snaps-ui": ^0.32.2
+    "@metamask/snaps-utils": ^0.32.2
     "@metamask/subject-metadata-controller": ^1.0.0
     "@metamask/test-dapp": ^5.6.0
     "@metamask/utils": ^5.0.0

From ed3cc404f27322c2ddd5e2cc02ac0dc780a92d66 Mon Sep 17 00:00:00 2001
From: Elliot Winkler <elliot.winkler@gmail.com>
Date: Thu, 30 Mar 2023 16:49:12 -0600
Subject: [PATCH 102/129] NetworkController: Split `network` into `networkId`
 and `networkStatus` (#17556)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `network` store of the network controller crams two types of data
into one place. It roughly tracks whether we have enough information to
make requests to the network and whether the network is capable of
receiving requests, but it also stores the ID of the network (as
obtained via `net_version`).

Generally we shouldn't be using the network ID for anything, as it has
been completely replaced by chain ID, which all custom RPC endpoints
have been required to support for over a year now. However, as the
network ID is used in various places within the extension codebase,
removing it entirely would be a non-trivial effort. So, minimally, this
commit splits `network` into two stores: `networkId` and
`networkStatus`. But it also expands the concept of network status.

Previously, the network was in one of two states: "loading" and
"not-loading". But now it can be in one of four states:

- `available`: The network is able to receive and respond to requests.
- `unavailable`: The network is not able to receive and respond to
  requests for unknown reasons.
- `blocked`: The network is actively blocking requests based on the
  user's geolocation. (This is specific to Infura.)
- `unknown`: We don't know whether the network can receive and respond
  to requests, either because we haven't checked or we tried to check
  and were unsuccessful.

This commit also changes how the network status is determined —
specifically, how many requests are used to determine that status, when
they occur, and whether they are awaited. Previously, the network
controller would make 2 to 3 requests during the course of running
`lookupNetwork`.

* First, if it was an Infura network, it would make a request for
  `eth_blockNumber` to determine whether Infura was blocking requests or
  not, then emit an appropriate event. This operation was not awaited.
* Then, regardless of the network, it would fetch the network ID via
  `net_version`. This operation was awaited.
* Finally, regardless of the network, it would fetch the latest block
  via `eth_getBlockByNumber`, then use the result to determine whether
  the network supported EIP-1559. This operation was awaited.

Now:

* One fewer request is made, specifically `eth_blockNumber`, as we don't
  need to make an extra request to determine whether Infura is blocking
  requests; we can reuse `eth_getBlockByNumber`;
* All requests are awaited, which makes `lookupNetwork` run fully
  in-band instead of partially out-of-band; and
* Both requests for `net_version` and `eth_getBlockByNumber` are
  performed in parallel to make `lookupNetwork` run slightly faster.
---
 app/scripts/background.js                     |    3 +-
 app/scripts/controllers/detect-tokens.test.js |  238 +-
 .../controllers/network/network-controller.js |  381 +-
 .../network/network-controller.test.js        | 4661 +++++++++++------
 app/scripts/controllers/swaps.js              |   14 +-
 app/scripts/controllers/swaps.test.js         |   27 +-
 app/scripts/controllers/transactions/index.js |   27 +-
 .../controllers/transactions/index.test.js    |   39 +-
 .../transactions/tx-state-manager.js          |   32 +-
 .../transactions/tx-state-manager.test.js     |   19 +-
 app/scripts/lib/setupSentry.js                |    3 +-
 app/scripts/metamask-controller.js            |   39 +-
 app/scripts/metamask-controller.test.js       |    6 +-
 app/scripts/migrations/083.test.js            |  103 +
 app/scripts/migrations/083.ts                 |   47 +
 app/scripts/migrations/index.js               |    2 +
 shared/constants/network.ts                   |   27 +
 test/data/mock-state.json                     |    3 +-
 test/e2e/fixture-builder.js                   |   15 +-
 test/e2e/tests/ens.spec.js                    |   28 +
 test/e2e/tests/send-eth.spec.js               |    6 +-
 ...rm-page-container-header.component.test.js |    4 +-
 .../app/dropdowns/network-dropdown.test.js    |    9 +-
 .../transaction-alerts.stories.js             |    2 +-
 .../confirm-transaction.duck.test.js          |    4 +-
 ui/ducks/metamask/metamask.test.js            |    3 +-
 ui/helpers/utils/tx-helper.ts                 |    8 +-
 ui/index.js                                   |    2 +-
 ui/pages/confirm-signature-request/index.js   |   12 +-
 .../confirm-transaction-base.container.js     |    4 +-
 .../confirm-transaction-base.test.js          |    2 +
 ui/selectors/confirm-transaction.test.js      |    2 +-
 ui/selectors/selectors.js                     |   14 +-
 ui/selectors/transactions.js                  |    4 +-
 ui/store/store.ts                             |    4 +-
 35 files changed, 3809 insertions(+), 1985 deletions(-)
 create mode 100644 app/scripts/migrations/083.test.js
 create mode 100644 app/scripts/migrations/083.ts

diff --git a/app/scripts/background.js b/app/scripts/background.js
index d36376e20..956487f89 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -223,7 +223,8 @@ browser.runtime.onConnectExternal.addListener(async (...args) => {
  * @property {object} provider - The current selected network provider.
  * @property {string} provider.rpcUrl - The address for the RPC API, if using an RPC API.
  * @property {string} provider.type - An identifier for the type of network selected, allows MetaMask to use custom provider strategies for known networks.
- * @property {string} network - A stringified number of the current network ID.
+ * @property {string} networkId - The stringified number of the current network ID.
+ * @property {string} networkStatus - Either "unknown", "available", "unavailable", or "blocked", depending on the status of the currently selected network.
  * @property {object} accounts - An object mapping lower-case hex addresses to objects with "balance" and "address" keys, both storing hex string values.
  * @property {hex} currentBlockGasLimit - The most recently seen block gas limit, in a lower case hex prefixed string.
  * @property {TransactionMeta[]} currentNetworkTxList - An array of transactions associated with the currently selected network.
diff --git a/app/scripts/controllers/detect-tokens.test.js b/app/scripts/controllers/detect-tokens.test.js
index cd8040a68..c90ebc590 100644
--- a/app/scripts/controllers/detect-tokens.test.js
+++ b/app/scripts/controllers/detect-tokens.test.js
@@ -17,8 +17,8 @@ import NetworkController, { NetworkControllerEventTypes } from './network';
 import PreferencesController from './preferences';
 
 describe('DetectTokensController', function () {
-  const sandbox = sinon.createSandbox();
-  let assetsContractController,
+  let sandbox,
+    assetsContractController,
     keyringMemStore,
     network,
     preferences,
@@ -32,87 +32,94 @@ describe('DetectTokensController', function () {
     getAccounts: noop,
   };
 
+  const infuraProjectId = 'infura-project-id';
+
   beforeEach(async function () {
-    keyringMemStore = new ObservableStore({ isUnlocked: false });
-    const networkControllerMessenger = new ControllerMessenger();
-    network = new NetworkController({
-      messenger: networkControllerMessenger,
-      infuraProjectId: 'foo',
-    });
-    network.initializeProvider(networkControllerProviderConfig);
-    provider = network.getProviderAndBlockTracker().provider;
-
-    const tokenListMessenger = new ControllerMessenger().getRestricted({
-      name: 'TokenListController',
-    });
-    tokenListController = new TokenListController({
-      chainId: '1',
-      preventPollingOnNetworkRestart: false,
-      onNetworkStateChange: sinon.spy(),
-      onPreferencesStateChange: sinon.spy(),
-      messenger: tokenListMessenger,
-    });
-    await tokenListController.start();
-
-    preferences = new PreferencesController({
-      network,
-      provider,
-      tokenListController,
-      onInfuraIsBlocked: sinon.stub(),
-      onInfuraIsUnblocked: sinon.stub(),
-    });
-    preferences.setAddresses([
-      '0x7e57e2',
-      '0xbc86727e770de68b1060c91f6bb6945c73e10388',
-    ]);
-    preferences.setUseTokenDetection(true);
-
-    tokensController = new TokensController({
-      onPreferencesStateChange: preferences.store.subscribe.bind(
-        preferences.store,
-      ),
-      onNetworkStateChange: (cb) =>
-        network.store.subscribe((networkState) => {
-          const modifiedNetworkState = {
-            ...networkState,
-            providerConfig: {
-              ...networkState.provider,
+    sandbox = sinon.createSandbox();
+    // Disable all requests, even those to localhost
+    nock.disableNetConnect();
+    nock('https://mainnet.infura.io')
+      .post(`/v3/${infuraProjectId}`)
+      .reply(200, (_uri, requestBody) => {
+        if (requestBody.method === 'eth_getBlockByNumber') {
+          return {
+            id: requestBody.id,
+            jsonrpc: '2.0',
+            result: {
+              number: '0x42',
             },
           };
-          return cb(modifiedNetworkState);
-        }),
-    });
+        }
 
-    assetsContractController = new AssetsContractController({
-      onPreferencesStateChange: preferences.store.subscribe.bind(
-        preferences.store,
-      ),
-      onNetworkStateChange: (cb) =>
-        networkControllerMessenger.subscribe(
-          NetworkControllerEventTypes.NetworkDidChange,
-          () => {
-            const networkState = network.store.getState();
-            const modifiedNetworkState = {
-              ...networkState,
-              providerConfig: {
-                ...networkState.provider,
-                chainId: convertHexToDecimal(networkState.provider.chainId),
-              },
-            };
-            return cb(modifiedNetworkState);
-          },
-        ),
-    });
+        if (requestBody.method === 'eth_blockNumber') {
+          return {
+            id: requestBody.id,
+            jsonrpc: '2.0',
+            result: '0x42',
+          };
+        }
 
-    sandbox
-      .stub(network, '_getLatestBlock')
-      .callsFake(() => Promise.resolve({}));
-    sandbox
-      .stub(tokensController, '_instantiateNewEthersProvider')
-      .returns(null);
-    sandbox
-      .stub(tokensController, '_detectIsERC721')
-      .returns(Promise.resolve(false));
+        throw new Error(`(Infura) Mock not defined for ${requestBody.method}`);
+      })
+      .persist();
+    nock('https://sepolia.infura.io')
+      .post(`/v3/${infuraProjectId}`)
+      .reply(200, (_uri, requestBody) => {
+        if (requestBody.method === 'eth_getBlockByNumber') {
+          return {
+            id: requestBody.id,
+            jsonrpc: '2.0',
+            result: {
+              number: '0x42',
+            },
+          };
+        }
+
+        if (requestBody.method === 'eth_blockNumber') {
+          return {
+            id: requestBody.id,
+            jsonrpc: '2.0',
+            result: '0x42',
+          };
+        }
+
+        throw new Error(`(Infura) Mock not defined for ${requestBody.method}`);
+      })
+      .persist();
+    nock('http://localhost:8545')
+      .post('/')
+      .reply(200, (_uri, requestBody) => {
+        if (requestBody.method === 'eth_getBlockByNumber') {
+          return {
+            id: requestBody.id,
+            jsonrpc: '2.0',
+            result: {
+              number: '0x42',
+            },
+          };
+        }
+
+        if (requestBody.method === 'eth_blockNumber') {
+          return {
+            id: requestBody.id,
+            jsonrpc: '2.0',
+            result: '0x42',
+          };
+        }
+
+        if (requestBody.method === 'net_version') {
+          return {
+            id: requestBody.id,
+            jsonrpc: '2.0',
+            result: '1337',
+          };
+        }
+
+        throw new Error(
+          `(localhost) Mock not defined for ${requestBody.method}`,
+        );
+      })
+      .persist();
     nock('https://token-api.metaswap.codefi.network')
       .get(`/tokens/1`)
       .reply(200, [
@@ -183,9 +190,82 @@ describe('DetectTokensController', function () {
       .get(`/tokens/3`)
       .reply(200, { error: 'ChainId 3 is not supported' })
       .persist();
+
+    keyringMemStore = new ObservableStore({ isUnlocked: false });
+    const networkControllerMessenger = new ControllerMessenger();
+    network = new NetworkController({
+      messenger: networkControllerMessenger,
+      infuraProjectId,
+    });
+    await network.initializeProvider(networkControllerProviderConfig);
+    provider = network.getProviderAndBlockTracker().provider;
+
+    const tokenListMessenger = new ControllerMessenger().getRestricted({
+      name: 'TokenListController',
+    });
+    tokenListController = new TokenListController({
+      chainId: '1',
+      preventPollingOnNetworkRestart: false,
+      onNetworkStateChange: sinon.spy(),
+      onPreferencesStateChange: sinon.spy(),
+      messenger: tokenListMessenger,
+    });
+    await tokenListController.start();
+
+    preferences = new PreferencesController({
+      network,
+      provider,
+      tokenListController,
+      onInfuraIsBlocked: sinon.stub(),
+      onInfuraIsUnblocked: sinon.stub(),
+    });
+    preferences.setAddresses([
+      '0x7e57e2',
+      '0xbc86727e770de68b1060c91f6bb6945c73e10388',
+    ]);
+    preferences.setUseTokenDetection(true);
+
+    tokensController = new TokensController({
+      config: { provider },
+      onPreferencesStateChange: preferences.store.subscribe.bind(
+        preferences.store,
+      ),
+      onNetworkStateChange: (cb) =>
+        network.store.subscribe((networkState) => {
+          const modifiedNetworkState = {
+            ...networkState,
+            providerConfig: {
+              ...networkState.provider,
+            },
+          };
+          return cb(modifiedNetworkState);
+        }),
+    });
+
+    assetsContractController = new AssetsContractController({
+      onPreferencesStateChange: preferences.store.subscribe.bind(
+        preferences.store,
+      ),
+      onNetworkStateChange: (cb) =>
+        networkControllerMessenger.subscribe(
+          NetworkControllerEventTypes.NetworkDidChange,
+          () => {
+            const networkState = network.store.getState();
+            const modifiedNetworkState = {
+              ...networkState,
+              providerConfig: {
+                ...networkState.provider,
+                chainId: convertHexToDecimal(networkState.provider.chainId),
+              },
+            };
+            return cb(modifiedNetworkState);
+          },
+        ),
+    });
   });
 
-  after(function () {
+  afterEach(function () {
+    nock.enableNetConnect('localhost');
     sandbox.restore();
   });
 
diff --git a/app/scripts/controllers/network/network-controller.js b/app/scripts/controllers/network/network-controller.js
index 0fa749d36..ca48d85c4 100644
--- a/app/scripts/controllers/network/network-controller.js
+++ b/app/scripts/controllers/network/network-controller.js
@@ -11,6 +11,8 @@ import EthQuery from 'eth-query';
 // eslint-disable-next-line no-unused-vars
 import { ControllerMessenger } from '@metamask/base-controller';
 import { v4 as random } from 'uuid';
+import { hasProperty, isPlainObject } from '@metamask/utils';
+import { errorCodes } from 'eth-rpc-errors';
 import {
   INFURA_PROVIDER_TYPES,
   BUILT_IN_NETWORKS,
@@ -18,8 +20,8 @@ import {
   TEST_NETWORK_TICKER_MAP,
   CHAIN_IDS,
   NETWORK_TYPES,
+  NetworkStatus,
 } from '../../../../shared/constants/network';
-import getFetchWithTimeout from '../../../../shared/modules/fetch-with-timeout';
 import {
   isPrefixedFormattedHexString,
   isSafeChainId,
@@ -36,40 +38,57 @@ import { createNetworkClient } from './create-network-client';
  * @property {string} [nickname] - Personalized network name.
  */
 
-const env = process.env.METAMASK_ENV;
-const fetchWithTimeout = getFetchWithTimeout();
+function buildDefaultProviderConfigState() {
+  if (process.env.IN_TEST) {
+    return {
+      type: NETWORK_TYPES.RPC,
+      rpcUrl: 'http://localhost:8545',
+      chainId: '0x539',
+      nickname: 'Localhost 8545',
+      ticker: 'ETH',
+    };
+  } else if (
+    process.env.METAMASK_DEBUG ||
+    process.env.METAMASK_ENV === 'test'
+  ) {
+    return {
+      type: NETWORK_TYPES.GOERLI,
+      chainId: CHAIN_IDS.GOERLI,
+      ticker: TEST_NETWORK_TICKER_MAP.GOERLI,
+    };
+  }
 
-const name = 'NetworkController';
-
-let defaultProviderConfigOpts;
-if (process.env.IN_TEST) {
-  defaultProviderConfigOpts = {
-    type: NETWORK_TYPES.RPC,
-    rpcUrl: 'http://localhost:8545',
-    chainId: '0x539',
-    nickname: 'Localhost 8545',
-  };
-} else if (process.env.METAMASK_DEBUG || env === 'test') {
-  defaultProviderConfigOpts = {
-    type: NETWORK_TYPES.GOERLI,
-    chainId: CHAIN_IDS.GOERLI,
-    ticker: TEST_NETWORK_TICKER_MAP.GOERLI,
-  };
-} else {
-  defaultProviderConfigOpts = {
+  return {
     type: NETWORK_TYPES.MAINNET,
     chainId: CHAIN_IDS.MAINNET,
+    ticker: 'ETH',
   };
 }
 
-const defaultProviderConfig = {
-  ticker: 'ETH',
-  ...defaultProviderConfigOpts,
-};
+function buildDefaultNetworkIdState() {
+  return null;
+}
 
-const defaultNetworkDetailsState = {
-  EIPS: { 1559: undefined },
-};
+function buildDefaultNetworkStatusState() {
+  return NetworkStatus.Unknown;
+}
+
+function buildDefaultNetworkDetailsState() {
+  return {
+    EIPS: {
+      1559: undefined,
+    },
+  };
+}
+
+function buildDefaultNetworkConfigurationsState() {
+  return {};
+}
+
+/**
+ * The name of the controller.
+ */
+const name = 'NetworkController';
 
 /**
  * The set of event types that this controller can publish via its messenger.
@@ -98,8 +117,6 @@ export const NetworkControllerEventTypes = {
 };
 
 export default class NetworkController extends EventEmitter {
-  static defaultProviderConfig = defaultProviderConfig;
-
   /**
    * Construct a NetworkController.
    *
@@ -121,31 +138,33 @@ export default class NetworkController extends EventEmitter {
 
     // create stores
     this.providerStore = new ObservableStore(
-      state.provider || { ...defaultProviderConfig },
+      state.provider || buildDefaultProviderConfigState(),
     );
     this.previousProviderStore = new ObservableStore(
       this.providerStore.getState(),
     );
-    this.networkStore = new ObservableStore('loading');
-    // We need to keep track of a few details about the current network
-    // Ideally we'd merge this.networkStore with this new store, but doing so
-    // will require a decent sized refactor of how we're accessing network
-    // state. Currently this is only used for detecting EIP 1559 support but
-    // can be extended to track other network details.
+    this.networkIdStore = new ObservableStore(buildDefaultNetworkIdState());
+    this.networkStatusStore = new ObservableStore(
+      buildDefaultNetworkStatusState(),
+    );
+    // We need to keep track of a few details about the current network.
+    // Ideally we'd merge this.networkStatusStore with this new store, but doing
+    // so will require a decent sized refactor of how we're accessing network
+    // state. Currently this is only used for detecting EIP-1559 support but can
+    // be extended to track other network details.
     this.networkDetails = new ObservableStore(
-      state.networkDetails || {
-        ...defaultNetworkDetailsState,
-      },
+      state.networkDetails || buildDefaultNetworkDetailsState(),
     );
 
     this.networkConfigurationsStore = new ObservableStore(
-      state.networkConfigurations || {},
+      state.networkConfigurations || buildDefaultNetworkConfigurationsState(),
     );
 
     this.store = new ComposedStore({
       provider: this.providerStore,
       previousProviderStore: this.previousProviderStore,
-      network: this.networkStore,
+      networkId: this.networkIdStore,
+      networkStatus: this.networkStatusStore,
       networkDetails: this.networkDetails,
       networkConfigurations: this.networkConfigurationsStore,
     });
@@ -189,10 +208,12 @@ export default class NetworkController extends EventEmitter {
   }
 
   /**
-   * Method to check if the block header contains fields that indicate EIP 1559
-   * support (baseFeePerGas).
+   * Determines whether the network supports EIP-1559 by checking whether the
+   * latest block has a `baseFeePerGas` property, then updates state
+   * appropriately.
    *
-   * @returns {Promise<boolean>} true if current network supports EIP 1559
+   * @returns {Promise<boolean>} A promise that resolves to true if the network
+   * supports EIP-1559 and false otherwise.
    */
   async getEIP1559Compatibility() {
     const { EIPS } = this.networkDetails.getState();
@@ -201,15 +222,28 @@ export default class NetworkController extends EventEmitter {
     if (EIPS[1559] !== undefined) {
       return EIPS[1559];
     }
-    const latestBlock = await this._getLatestBlock();
-    const supportsEIP1559 =
-      latestBlock && latestBlock.baseFeePerGas !== undefined;
-    this._setNetworkEIPSupport(1559, supportsEIP1559);
+    const supportsEIP1559 = await this._determineEIP1559Compatibility();
+    this.networkDetails.updateState({
+      EIPS: {
+        ...this.networkDetails.getState().EIPS,
+        1559: supportsEIP1559,
+      },
+    });
     return supportsEIP1559;
   }
 
+  /**
+   * Captures information about the currently selected network — namely,
+   * the network ID and whether the network supports EIP-1559 — and then uses
+   * the results of these requests to determine the status of the network.
+   */
   async lookupNetwork() {
-    // Prevent firing when provider is not defined.
+    const { chainId, type } = this.providerStore.getState();
+    let networkChanged = false;
+    let networkId;
+    let supportsEIP1559;
+    let networkStatus;
+
     if (!this._provider) {
       log.warn(
         'NetworkController - lookupNetwork aborted due to missing provider',
@@ -217,46 +251,102 @@ export default class NetworkController extends EventEmitter {
       return;
     }
 
-    const { chainId } = this.providerStore.getState();
     if (!chainId) {
       log.warn(
         'NetworkController - lookupNetwork aborted due to missing chainId',
       );
-      this._setNetworkState('loading');
-      this._clearNetworkDetails();
+      this._resetNetworkId();
+      this._resetNetworkStatus();
+      this._resetNetworkDetails();
       return;
     }
 
-    // Ping the RPC endpoint so we can confirm that it works
-    const initialNetwork = this.networkStore.getState();
-    const { type } = this.providerStore.getState();
     const isInfura = INFURA_PROVIDER_TYPES.includes(type);
 
-    if (isInfura) {
-      this._checkInfuraAvailability(type);
-    } else {
-      this.messenger.publish(NetworkControllerEventTypes.InfuraIsUnblocked);
+    const listener = () => {
+      networkChanged = true;
+      this.messenger.unsubscribe(
+        NetworkControllerEventTypes.NetworkDidChange,
+        listener,
+      );
+    };
+    this.messenger.subscribe(
+      NetworkControllerEventTypes.NetworkDidChange,
+      listener,
+    );
+
+    try {
+      const results = await Promise.all([
+        this._getNetworkId(),
+        this._determineEIP1559Compatibility(),
+      ]);
+      networkId = results[0];
+      supportsEIP1559 = results[1];
+      networkStatus = NetworkStatus.Available;
+    } catch (error) {
+      if (hasProperty(error, 'code')) {
+        let responseBody;
+        try {
+          responseBody = JSON.parse(error.message);
+        } catch {
+          // error.message must not be JSON
+        }
+
+        if (
+          isPlainObject(responseBody) &&
+          responseBody.error === INFURA_BLOCKED_KEY
+        ) {
+          networkStatus = NetworkStatus.Blocked;
+        } else if (error.code === errorCodes.rpc.internal) {
+          networkStatus = NetworkStatus.Unknown;
+        } else {
+          networkStatus = NetworkStatus.Unavailable;
+        }
+      } else {
+        log.warn(
+          'NetworkController - could not determine network status',
+          error,
+        );
+        networkStatus = NetworkStatus.Unknown;
+      }
     }
 
-    let networkVersion;
-    let networkVersionError;
-    try {
-      networkVersion = await this._getNetworkId();
-    } catch (error) {
-      networkVersionError = error;
-    }
-    if (initialNetwork !== this.networkStore.getState()) {
+    if (networkChanged) {
+      // If the network has changed, then `lookupNetwork` either has been or is
+      // in the process of being called, so we don't need to go further.
       return;
     }
+    this.messenger.unsubscribe(
+      NetworkControllerEventTypes.NetworkDidChange,
+      listener,
+    );
 
-    if (networkVersionError) {
-      this._setNetworkState('loading');
-      // keep network details in sync with network state
-      this._clearNetworkDetails();
+    this.networkStatusStore.putState(networkStatus);
+
+    if (networkStatus === NetworkStatus.Available) {
+      this.networkIdStore.putState(networkId);
+      this.networkDetails.updateState({
+        EIPS: {
+          ...this.networkDetails.getState().EIPS,
+          1559: supportsEIP1559,
+        },
+      });
     } else {
-      this._setNetworkState(networkVersion);
-      // look up EIP-1559 support
-      await this.getEIP1559Compatibility();
+      this._resetNetworkId();
+      this._resetNetworkDetails();
+    }
+
+    if (isInfura) {
+      if (networkStatus === NetworkStatus.Available) {
+        this.messenger.publish(NetworkControllerEventTypes.InfuraIsUnblocked);
+      } else if (networkStatus === NetworkStatus.Blocked) {
+        this.messenger.publish(NetworkControllerEventTypes.InfuraIsBlocked);
+      }
+    } else {
+      // Always publish infuraIsUnblocked regardless of network status to
+      // prevent consumers from being stuck in a blocked state if they were
+      // previously connected to an Infura network that was blocked
+      this.messenger.publish(NetworkControllerEventTypes.InfuraIsUnblocked);
     }
   }
 
@@ -319,13 +409,38 @@ export default class NetworkController extends EventEmitter {
   // Private
   //
 
+  /**
+   * Method to return the latest block for the current network
+   *
+   * @returns {object} Block header
+   */
+  _getLatestBlock() {
+    const { provider } = this.getProviderAndBlockTracker();
+    const ethQuery = new EthQuery(provider);
+
+    return new Promise((resolve, reject) => {
+      ethQuery.sendAsync(
+        { method: 'eth_getBlockByNumber', params: ['latest', false] },
+        (error, result) => {
+          if (error) {
+            reject(error);
+          } else {
+            resolve(result);
+          }
+        },
+      );
+    });
+  }
+
   /**
    * Get the network ID for the current selected network
    *
    * @returns {string} The network ID for the current network.
    */
   async _getNetworkId() {
-    const ethQuery = new EthQuery(this._provider);
+    const { provider } = this.getProviderAndBlockTracker();
+    const ethQuery = new EthQuery(provider);
+
     return await new Promise((resolve, reject) => {
       ethQuery.sendAsync({ method: 'net_version' }, (error, result) => {
         if (error) {
@@ -338,49 +453,24 @@ export default class NetworkController extends EventEmitter {
   }
 
   /**
-   * Method to return the latest block for the current network
-   *
-   * @returns {object} Block header
+   * Clears the stored network ID.
    */
-  _getLatestBlock() {
-    return new Promise((resolve, reject) => {
-      const { provider } = this.getProviderAndBlockTracker();
-      const ethQuery = new EthQuery(provider);
-      ethQuery.sendAsync(
-        { method: 'eth_getBlockByNumber', params: ['latest', false] },
-        (err, block) => {
-          if (err) {
-            return reject(err);
-          }
-          return resolve(block);
-        },
-      );
-    });
-  }
-
-  _setNetworkState(network) {
-    this.networkStore.putState(network);
+  _resetNetworkId() {
+    this.networkIdStore.putState(buildDefaultNetworkIdState());
   }
 
   /**
-   * Set EIP support indication in the networkDetails store
-   *
-   * @param {number} EIPNumber - The number of the EIP to mark support for
-   * @param {boolean} isSupported - True if the EIP is supported
+   * Resets network status to the default ("unknown").
    */
-  _setNetworkEIPSupport(EIPNumber, isSupported) {
-    this.networkDetails.putState({
-      EIPS: {
-        [EIPNumber]: isSupported,
-      },
-    });
+  _resetNetworkStatus() {
+    this.networkStatusStore.putState(buildDefaultNetworkStatusState());
   }
 
   /**
-   * Reset EIP support to default (no support)
+   * Clears details previously stored for the network.
    */
-  _clearNetworkDetails() {
-    this.networkDetails.putState({ ...defaultNetworkDetailsState });
+  _resetNetworkDetails() {
+    this.networkDetails.putState(buildDefaultNetworkDetailsState());
   }
 
   /**
@@ -394,67 +484,26 @@ export default class NetworkController extends EventEmitter {
     this._switchNetwork(config);
   }
 
-  async _checkInfuraAvailability(network) {
-    const rpcUrl = `https://${network}.infura.io/v3/${this._infuraProjectId}`;
-
-    let networkChanged = false;
-    const listener = () => {
-      networkChanged = true;
-      this.messenger.unsubscribe(
-        NetworkControllerEventTypes.NetworkDidChange,
-        listener,
-      );
-    };
-    this.messenger.subscribe(
-      NetworkControllerEventTypes.NetworkDidChange,
-      listener,
-    );
-
-    try {
-      const response = await fetchWithTimeout(rpcUrl, {
-        method: 'POST',
-        body: JSON.stringify({
-          jsonrpc: '2.0',
-          method: 'eth_blockNumber',
-          params: [],
-          id: 1,
-        }),
-      });
-
-      if (networkChanged) {
-        return;
-      }
-
-      if (response.ok) {
-        this.messenger.publish(NetworkControllerEventTypes.InfuraIsUnblocked);
-      } else {
-        const responseMessage = await response.json();
-        if (networkChanged) {
-          return;
-        }
-        if (responseMessage.error === INFURA_BLOCKED_KEY) {
-          this.messenger.publish(NetworkControllerEventTypes.InfuraIsBlocked);
-        }
-      }
-    } catch (err) {
-      log.warn(`MetaMask - Infura availability check failed`, err);
-    }
+  /**
+   * Retrieves the latest block from the currently selected network; if the
+   * block has a `baseFeePerGas` property, then we know that the network
+   * supports EIP-1559; otherwise it doesn't.
+   *
+   * @returns {Promise<boolean>} A promise that resolves to true if the network
+   * supports EIP-1559 and false otherwise.
+   */
+  async _determineEIP1559Compatibility() {
+    const latestBlock = await this._getLatestBlock();
+    return latestBlock && latestBlock.baseFeePerGas !== undefined;
   }
 
   _switchNetwork(opts) {
-    // Indicate to subscribers that network is about to change
     this.messenger.publish(NetworkControllerEventTypes.NetworkWillChange);
-    // Set loading state
-    this._setNetworkState('loading');
-    // Reset network details
-    this._clearNetworkDetails();
-    // Configure the provider appropriately
+    this._resetNetworkId();
+    this._resetNetworkStatus();
+    this._resetNetworkDetails();
     this._configureProvider(opts);
-    // Notify subscribers that network has changed
-    this.messenger.publish(
-      NetworkControllerEventTypes.NetworkDidChange,
-      opts.type,
-    );
+    this.messenger.publish(NetworkControllerEventTypes.NetworkDidChange);
     this.lookupNetwork();
   }
 
diff --git a/app/scripts/controllers/network/network-controller.test.js b/app/scripts/controllers/network/network-controller.test.js
index ce160a65a..e8684179e 100644
--- a/app/scripts/controllers/network/network-controller.test.js
+++ b/app/scripts/controllers/network/network-controller.test.js
@@ -3,19 +3,11 @@ import { isMatch } from 'lodash';
 import { v4 } from 'uuid';
 import nock from 'nock';
 import sinon from 'sinon';
-import * as ethJsonRpcProvider from '@metamask/eth-json-rpc-provider';
 import { ControllerMessenger } from '@metamask/base-controller';
 import { BUILT_IN_NETWORKS } from '../../../../shared/constants/network';
 import { EVENT } from '../../../../shared/constants/metametrics';
 import NetworkController from './network-controller';
 
-jest.mock('@metamask/eth-json-rpc-provider', () => {
-  return {
-    __esModule: true,
-    ...jest.requireActual('@metamask/eth-json-rpc-provider'),
-  };
-});
-
 jest.mock('uuid', () => {
   const actual = jest.requireActual('uuid');
 
@@ -59,35 +51,7 @@ const originalSetTimeout = global.setTimeout;
  * `baseFeePerGas` property).
  */
 const PRE_1559_BLOCK = {
-  difficulty: '0x0',
-  extraData: '0x',
-  gasLimit: '0x1c9c380',
-  gasUsed: '0x598c9b',
-  hash: '0xfb2086eb924ffce4061f94c3b65f303e0351f8e7deff185fe1f5e9001ff96f63',
-  logsBloom:
-    '0x7034820113921800018e8070900006316040002225c04a0624110010841018a2109040401004112a4c120f00220a2119020000714b143a04004106120130a8450080433129401068ed22000a54a48221a1020202524204045421b883882530009a1800b08a1309408008828403010d530440001a40003c0006240291008c0404c211610c690b00f1985e000009c02503240040010989c01cf2806840043815498e90012103e06084051542c0094002494008044c24a0a13281e0009601481073010800130402464202212202a8088210442a8ec81b080430075629e60a00a082005a3988400940a4009012a204011a0018a00903222a60420428888144210802',
-  miner: '0xffee087852cb4898e6c3532e776e68bc68b1143b',
-  mixHash: '0xb17ba50cd7261e77a213fb75704dcfd8a28fbcd78d100691a112b7cc2893efa2',
-  nonce: '0x0000000000000000',
-  number: '0x2', // number set to "2" to simplify tests
-  parentHash:
-    '0x31406d1bf1a2ca12371ce5b3ecb20568d6a8b9bf05b49b71b93ba33f317d5a82',
-  receiptsRoot:
-    '0x5ba97ece1afbac2a8fe0344f9022fe808342179b26ea3ecc2e0b8c4b46b7f8cd',
-  sha3Uncles:
-    '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347',
-  size: '0x70f4',
-  stateRoot:
-    '0x36bfb7ca106d41c4458292669126e091011031c5af612dee1c2e6424ef92b080',
-  timestamp: '0x639b6d9b',
-  totalDifficulty: '0xc70d815d562d3cfa955',
-  transactions: [
-    // reduced to a single transaction to make fixture less verbose
-    '0x2761e939dc822f64141bd00bc7ef8cee16201af10e862469212396664cee81ce',
-  ],
-  transactionsRoot:
-    '0x98bbdfbe1074bc3aa72a77a281f16d6ba7e723d68f15937d80954fb34d323369',
-  uncles: [],
+  number: '0x42',
 };
 
 /**
@@ -123,28 +87,62 @@ const JSONRPC_RESPONSE_BODY_PROPERTIES = ['id', 'jsonrpc', 'result', 'error'];
  */
 const INFURA_NETWORKS = [
   {
-    nickname: 'Mainnet',
     networkType: 'mainnet',
     chainId: '0x1',
-    networkVersion: '1',
+    networkId: '1',
     ticker: 'ETH',
   },
   {
-    nickname: 'Goerli',
     networkType: 'goerli',
     chainId: '0x5',
-    networkVersion: '5',
+    networkId: '5',
     ticker: 'GoerliETH',
   },
   {
-    nickname: 'Sepolia',
     networkType: 'sepolia',
     chainId: '0xaa36a7',
-    networkVersion: '11155111',
+    networkId: '11155111',
     ticker: 'SepoliaETH',
   },
 ];
 
+/**
+ * A response object for a successful request to `eth_getBlockByNumber`. It is
+ * assumed that the block number here is insignificant to the test.
+ */
+const SUCCESSFUL_ETH_GET_BLOCK_BY_NUMBER_RESPONSE = {
+  result: BLOCK,
+  error: null,
+};
+
+/**
+ * A response object for a request that has been geoblocked by Infura.
+ */
+const BLOCKED_INFURA_RESPONSE = {
+  result: null,
+  error: 'countryBlocked',
+  httpStatus: 500,
+};
+
+/**
+ * A response object for a successful request to `net_version`. It is assumed
+ * that the network ID here is insignificant to the test.
+ */
+const SUCCESSFUL_NET_VERSION_RESPONSE = {
+  result: '42',
+  error: null,
+};
+
+/**
+ * A response object for a unsuccessful request to any RPC method. It is assumed
+ * that the error here is insignificant to the test.
+ */
+const UNSUCCESSFUL_JSON_RPC_RESPONSE = {
+  result: null,
+  error: 'oops',
+  httpStatus: 500,
+};
+
 /**
  * Handles mocking provider requests for a particular network.
  */
@@ -183,6 +181,9 @@ class NetworkCommunications {
       customRpcUrl,
     };
     this.networkClientType = networkClientType;
+    if (networkClientType !== 'infura' && networkClientType !== 'custom') {
+      throw new Error("networkClientType must be 'infura' or 'custom'");
+    }
     this.#networkClientOptions = networkClientOptions;
     this.infuraProjectId = infuraProjectId;
     const rpcUrl =
@@ -239,23 +240,6 @@ class NetworkCommunications {
     }
 
     const defaultMocksByRpcMethod = {
-      eth_blockNumber: {
-        request: {
-          method: 'eth_blockNumber',
-          params: [],
-        },
-        response: {
-          result: latestBlockNumber,
-        },
-        // When the provider is configured for an Infura network,
-        // NetworkController makes a sentinel request for `eth_blockNumber`, so
-        // we ensure that it is mocked by default. Conversely, when the provider
-        // is configured for a custom RPC endpoint, we don't mock
-        // `eth_blockNumber` at all unless specified. Admittedly, this is a bit
-        // magical, but it saves us from having to think about this in tests
-        // if we don't have to.
-        times: this.networkClientType === 'infura' ? 1 : 0,
-      },
       eth_getBlockByNumber: {
         request: {
           method: 'eth_getBlockByNumber',
@@ -274,11 +258,29 @@ class NetworkCommunications {
           result: '1',
         },
       },
+      // The request that the block tracker makes always occurs after any
+      // request that the network controller makes (because such a request goes
+      // through the block cache middleware and that is what spawns the block
+      // tracker).
+      eth_blockNumber: {
+        request: {
+          method: 'eth_blockNumber',
+          params: [],
+        },
+        response: {
+          result: latestBlockNumber,
+        },
+        // If there is no latest block number then the request that spawned the
+        // block tracker won't be cached inside of the block tracker, so the
+        // block tracker makes another request when it is asked for the latest
+        // block.
+        times: latestBlock === null ? 2 : 1,
+      },
     };
     const providedMocksByRpcMethod = {
-      eth_blockNumber: ethBlockNumberMocks,
       eth_getBlockByNumber: ethGetBlockByNumberMocks,
       net_version: netVersionMocks,
+      eth_blockNumber: ethBlockNumberMocks,
     };
 
     const allMocks = [];
@@ -298,23 +300,6 @@ class NetworkCommunications {
       }
     });
 
-    // The request that the block tracker makes always occurs after any request
-    // that the network controller makes (because such a request goes through
-    // the block cache middleware and that is what spawns the block tracker). We
-    // don't need to customize the block tracker request; we just need to ensure
-    // that the block number it returns matches the same block number that
-    // `eth_getBlockByNumber` uses.
-    allMocks.push({
-      request: {
-        method: 'eth_blockNumber',
-        params: [],
-      },
-      response: {
-        result: latestBlockNumber,
-      },
-      times: latestBlock === null ? 2 : 1,
-    });
-
     allMocks.forEach((mock) => {
       this.mockRpcCall(mock);
     });
@@ -448,34 +433,33 @@ describe('NetworkController', () => {
     });
 
     it('accepts initial state', async () => {
-      const exampleInitialState = {
-        provider: {
-          type: 'rpc',
-          rpcUrl: 'http://example-custom-rpc.metamask.io',
-          chainId: '0x9999',
-          nickname: 'Test initial state',
-        },
-        networkDetails: {
-          EIPS: {
-            1559: false,
-          },
-        },
-      };
-
       await withController(
         {
-          state: exampleInitialState,
+          state: {
+            provider: {
+              type: 'rpc',
+              rpcUrl: 'http://example-custom-rpc.metamask.io',
+              chainId: '0x9999',
+              nickname: 'Test initial state',
+            },
+            networkDetails: {
+              EIPS: {
+                1559: false,
+              },
+            },
+          },
         },
         ({ controller }) => {
           expect(controller.store.getState()).toMatchInlineSnapshot(`
             {
-              "network": "loading",
               "networkConfigurations": {},
               "networkDetails": {
                 "EIPS": {
                   "1559": false,
                 },
               },
+              "networkId": null,
+              "networkStatus": "unknown",
               "previousProviderStore": {
                 "chainId": "0x9999",
                 "nickname": "Test initial state",
@@ -498,13 +482,14 @@ describe('NetworkController', () => {
       await withController(({ controller }) => {
         expect(controller.store.getState()).toMatchInlineSnapshot(`
           {
-            "network": "loading",
             "networkConfigurations": {},
             "networkDetails": {
               "EIPS": {
                 "1559": undefined,
               },
             },
+            "networkId": null,
+            "networkStatus": "unknown",
             "previousProviderStore": {
               "chainId": "0x539",
               "nickname": "Localhost 8545",
@@ -538,7 +523,7 @@ describe('NetworkController', () => {
       await withController(async ({ controller, network }) => {
         network.mockEssentialRpcCalls({
           eth_blockNumber: {
-            times: 1,
+            times: 2,
           },
         });
         await controller.initializeProvider();
@@ -547,7 +532,7 @@ describe('NetworkController', () => {
         blockTracker.addListener('latest', () => {
           // do nothing
         });
-        expect(blockTracker.isRunning()).toBe(true);
+        expect(blockTracker.isRunning()).toBeTruthy();
 
         await controller.destroy();
 
@@ -575,14 +560,9 @@ describe('NetworkController', () => {
       );
     });
 
-    for (const {
-      nickname,
-      networkType,
-      chainId,
-      networkVersion,
-    } of INFURA_NETWORKS) {
+    for (const { networkType, chainId } of INFURA_NETWORKS) {
       describe(`when the type in the provider configuration is "${networkType}"`, () => {
-        it(`initializes a provider pointed to the ${nickname} Infura network (chainId: ${chainId})`, async () => {
+        it(`initializes a provider pointed to the "${networkType}" Infura network (chainId: ${chainId})`, async () => {
           await withController(
             {
               state: {
@@ -611,7 +591,7 @@ describe('NetworkController', () => {
           );
         });
 
-        it('emits infuraIsUnblocked (assuming that the request to eth_blockNumber responds successfully)', async () => {
+        it('emits infuraIsBlocked or infuraIsUnblocked, depending on whether Infura is blocking requests', async () => {
           const messenger = buildMessenger();
 
           await withController(
@@ -642,7 +622,7 @@ describe('NetworkController', () => {
           );
         });
 
-        it(`persists "${networkVersion}" to state as the network version of ${nickname}`, async () => {
+        it('determines the status of the network, storing it in state', async () => {
           await withController(
             {
               state: {
@@ -656,15 +636,18 @@ describe('NetworkController', () => {
             },
             async ({ controller, network }) => {
               network.mockEssentialRpcCalls();
+              expect(controller.store.getState().networkStatus).toBe('unknown');
 
               await controller.initializeProvider();
 
-              expect(controller.store.getState().network).toBe(networkVersion);
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
             },
           );
         });
 
-        it(`persists to state whether the network supports EIP-1559 (assuming that the request for eth_getBlockByNumber responds successfully)`, async () => {
+        it('determines whether the network supports EIP-1559 and stores the result in state without overwriting other state in the networkDetails store', async () => {
           await withController(
             {
               state: {
@@ -674,9 +657,10 @@ describe('NetworkController', () => {
                   // of the network selected, it just needs to exist
                   chainId: '0x9999999',
                 },
-              },
-              networkDetails: {
-                EIPS: {},
+                networkDetails: {
+                  EIPS: {},
+                  other: 'details',
+                },
               },
             },
             async ({ controller, network }) => {
@@ -686,9 +670,12 @@ describe('NetworkController', () => {
 
               await controller.initializeProvider();
 
-              expect(
-                controller.store.getState().networkDetails.EIPS['1559'],
-              ).toBe(true);
+              expect(controller.store.getState().networkDetails).toStrictEqual({
+                EIPS: {
+                  1559: true,
+                },
+                other: 'details',
+              });
             },
           );
         });
@@ -790,7 +777,48 @@ describe('NetworkController', () => {
         );
       });
 
-      it('persists the network version to state (assuming that the request for net_version responds successfully)', async () => {
+      it('does not emit infuraIsBlocked', async () => {
+        const messenger = buildMessenger();
+
+        await withController(
+          {
+            messenger,
+            state: {
+              provider: {
+                type: 'rpc',
+                rpcUrl: 'https://mock-rpc-url',
+                chainId: '0xtest',
+                ticker: 'TEST',
+                id: 'testNetworkConfigurationId',
+              },
+              networkConfigurations: {
+                testNetworkConfigurationId: {
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0xtest',
+                  ticker: 'TEST',
+                  id: 'testNetworkConfigurationId',
+                },
+              },
+            },
+          },
+          async ({ controller, network }) => {
+            network.mockEssentialRpcCalls();
+
+            const promiseForNoInfuraIsBlockedEvents = waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:infuraIsBlocked',
+              count: 0,
+              operation: async () => {
+                await controller.initializeProvider();
+              },
+            });
+
+            expect(await promiseForNoInfuraIsBlockedEvents).toBeTruthy();
+          },
+        );
+      });
+
+      it('determines the status of the network, storing it in state', async () => {
         await withController(
           {
             state: {
@@ -814,20 +842,19 @@ describe('NetworkController', () => {
           async ({ controller, network }) => {
             network.mockEssentialRpcCalls({
               net_version: {
-                response: {
-                  result: '42',
-                },
+                response: SUCCESSFUL_NET_VERSION_RESPONSE,
               },
             });
+            expect(controller.store.getState().networkStatus).toBe('unknown');
 
             await controller.initializeProvider();
 
-            expect(controller.store.getState().network).toBe('42');
+            expect(controller.store.getState().networkStatus).toBe('available');
           },
         );
       });
 
-      it('persists to state whether the network supports EIP-1559 (assuming that the request for eth_getBlockByNumber responds successfully)', async () => {
+      it('determines whether the network supports EIP-1559, storing it in state', async () => {
         await withController(
           {
             state: {
@@ -846,6 +873,10 @@ describe('NetworkController', () => {
                   id: 'testNetworkConfigurationId',
                 },
               },
+              networkDetails: {
+                EIPS: {},
+                other: 'details',
+              },
             },
           },
           async ({ controller, network }) => {
@@ -855,9 +886,12 @@ describe('NetworkController', () => {
 
             await controller.initializeProvider();
 
-            expect(
-              controller.store.getState().networkDetails.EIPS['1559'],
-            ).toBe(true);
+            expect(controller.store.getState().networkDetails).toStrictEqual({
+              EIPS: {
+                1559: true,
+              },
+              other: 'details',
+            });
           },
         );
       });
@@ -888,9 +922,9 @@ describe('NetworkController', () => {
       });
     });
 
-    for (const { nickname, networkType, chainId } of INFURA_NETWORKS) {
+    for (const { networkType, chainId } of INFURA_NETWORKS) {
       describe(`when the type in the provider configuration is changed to "${networkType}"`, () => {
-        it(`returns a provider object that was pointed to another network before the switch and is pointed to ${nickname} afterward`, async () => {
+        it(`returns a provider object that was pointed to another network before the switch and is pointed to "${networkType}" afterward`, async () => {
           await withController(
             {
               state: {
@@ -898,25 +932,18 @@ describe('NetworkController', () => {
                   type: 'rpc',
                   rpcUrl: 'https://mock-rpc-url',
                   chainId: '0x1337',
-                  nickname: 'test-chain',
-                  ticker: 'TEST',
-                  rpcPrefs: {
-                    blockExplorerUrl: 'test-block-explorer.com',
-                  },
-                  id: 'testNetworkConfigurationId',
-                },
-                networkConfigurations: {
-                  testNetworkConfigurationId: {
-                    rpcUrl: 'https://mock-rpc-url',
-                    chainId: '0x1337',
-                    ticker: 'TEST',
-                    id: 'testNetworkConfigurationId',
-                  },
                 },
               },
             },
-            async ({ controller, network }) => {
-              network.mockEssentialRpcCalls();
+            async ({ controller, network: network1 }) => {
+              network1.mockEssentialRpcCalls();
+              const network2 = new NetworkCommunications({
+                networkClientType: 'infura',
+                networkClientOptions: {
+                  infuraNetwork: networkType,
+                },
+              });
+              network2.mockEssentialRpcCalls();
               await controller.initializeProvider();
               const { provider } = controller.getProviderAndBlockTracker();
 
@@ -953,15 +980,21 @@ describe('NetworkController', () => {
               networkConfigurations: {
                 testNetworkConfigurationId: {
                   rpcUrl: 'https://mock-rpc-url',
-                  chainId: '0xtest',
-                  ticker: 'TEST',
+                  chainId: '0x1337',
                   id: 'testNetworkConfigurationId',
                 },
               },
             },
           },
-          async ({ controller, network }) => {
-            network.mockEssentialRpcCalls();
+          async ({ controller, network: network1 }) => {
+            network1.mockEssentialRpcCalls();
+            const network2 = new NetworkCommunications({
+              networkClientType: 'custom',
+              networkClientOptions: {
+                customRpcUrl: 'https://mock-rpc-url',
+              },
+            });
+            network2.mockEssentialRpcCalls();
             await controller.initializeProvider();
             const { provider } = controller.getProviderAndBlockTracker();
 
@@ -980,7 +1013,7 @@ describe('NetworkController', () => {
             const { result: newChainIdResult } = await promisifiedSendAsync2({
               method: 'eth_chainId',
             });
-            expect(newChainIdResult).toBe('0xtest');
+            expect(newChainIdResult).toBe('0x1337');
           },
         );
       });
@@ -989,7 +1022,7 @@ describe('NetworkController', () => {
 
   describe('getEIP1559Compatibility', () => {
     describe('when the latest block has a baseFeePerGas property', () => {
-      it('persists to state that the network supports EIP-1559', async () => {
+      it('stores the fact that the network supports EIP-1559', async () => {
         await withController(
           {
             state: {
@@ -1022,13 +1055,13 @@ describe('NetworkController', () => {
 
           const supportsEIP1559 = await controller.getEIP1559Compatibility();
 
-          expect(supportsEIP1559).toBe(true);
+          expect(supportsEIP1559).toBeTruthy();
         });
       });
     });
 
     describe('when the latest block does not have a baseFeePerGas property', () => {
-      it('persists to state that the network does not support EIP-1559', async () => {
+      it('stores the fact that the network does not support EIP-1559', async () => {
         await withController(
           {
             state: {
@@ -1067,7 +1100,7 @@ describe('NetworkController', () => {
     });
 
     describe('when the request for the latest block responds with null', () => {
-      it('persists null to state as whether the network supports EIP-1559', async () => {
+      it('stores null as whether the network supports EIP-1559', async () => {
         await withController(
           {
             state: {
@@ -1107,8 +1140,11 @@ describe('NetworkController', () => {
 
     it('does not make multiple requests to eth_getBlockByNumber when called multiple times and the request to eth_getBlockByNumber succeeded the first time', async () => {
       await withController(async ({ controller, network }) => {
-        // This mocks eth_getBlockByNumber once by default
-        network.mockEssentialRpcCalls();
+        network.mockEssentialRpcCalls({
+          eth_getBlockByNumber: {
+            times: 1,
+          },
+        });
         await withoutCallingGetEIP1559Compatibility({
           controller,
           operation: async () => {
@@ -1119,7 +1155,7 @@ describe('NetworkController', () => {
         await controller.getEIP1559Compatibility();
         await controller.getEIP1559Compatibility();
 
-        expect(network.nockScope.isDone()).toBe(true);
+        expect(network.nockScope.isDone()).toBeTruthy();
       });
     });
   });
@@ -1165,15 +1201,16 @@ describe('NetworkController', () => {
         await withController({ messenger }, async ({ controller, network }) => {
           network.mockEssentialRpcCalls();
 
-          const promiseForInfuraIsUnblocked = waitForPublishedEvents({
+          const promiseForNoInfuraIsUnblockedEvents = waitForPublishedEvents({
             messenger,
             eventType: 'NetworkController:infuraIsUnblocked',
+            count: 0,
             operation: async () => {
               await controller.lookupNetwork();
             },
           });
 
-          await expect(promiseForInfuraIsUnblocked).toNeverResolve();
+          expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
         });
       });
 
@@ -1183,23 +1220,285 @@ describe('NetworkController', () => {
         await withController({ messenger }, async ({ controller, network }) => {
           network.mockEssentialRpcCalls();
 
-          const promiseForInfuraIsBlocked = waitForPublishedEvents({
+          const promiseForNoInfuraIsBlockedEvents = waitForPublishedEvents({
             messenger,
             eventType: 'NetworkController:infuraIsBlocked',
+            count: 0,
             operation: async () => {
               await controller.lookupNetwork();
             },
           });
 
-          await expect(promiseForInfuraIsBlocked).toNeverResolve();
+          expect(await promiseForNoInfuraIsBlockedEvents).toBeTruthy();
         });
       });
     });
 
-    for (const { nickname, networkType, networkVersion } of INFURA_NETWORKS) {
+    describe('if the provider has initialized, but the current network has no chainId', () => {
+      it('does not update state in any way', async () => {
+        await withController(
+          {
+            state: {
+              provider: {
+                type: 'rpc',
+                rpcUrl: 'http://example-custom-rpc.metamask.io',
+              },
+              networkDetails: {
+                EIPS: {
+                  1559: true,
+                },
+              },
+            },
+          },
+          async ({ controller, network }) => {
+            network.mockEssentialRpcCalls();
+            await controller.initializeProvider();
+            const stateAfterInitialization = controller.store.getState();
+
+            await controller.lookupNetwork();
+
+            expect(controller.store.getState()).toStrictEqual(
+              stateAfterInitialization,
+            );
+          },
+        );
+      });
+
+      it('does not emit infuraIsUnblocked', async () => {
+        const messenger = buildMessenger();
+
+        await withController(
+          {
+            messenger,
+            state: {
+              provider: {
+                type: 'rpc',
+                rpcUrl: 'http://example-custom-rpc.metamask.io',
+              },
+            },
+          },
+          async ({ controller, network }) => {
+            network.mockEssentialRpcCalls();
+            await controller.initializeProvider();
+
+            const promiseForNoInfuraIsUnblockedEvents = waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:infuraIsUnblocked',
+              count: 0,
+              operation: async () => {
+                await controller.lookupNetwork();
+              },
+            });
+
+            expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
+          },
+        );
+      });
+
+      it('does not emit infuraIsBlocked', async () => {
+        const messenger = buildMessenger();
+
+        await withController(
+          {
+            messenger,
+            state: {
+              provider: {
+                type: 'rpc',
+                rpcUrl: 'http://example-custom-rpc.metamask.io',
+              },
+            },
+          },
+          async ({ controller, network }) => {
+            network.mockEssentialRpcCalls();
+            await controller.initializeProvider();
+
+            const promiseForNoInfuraIsBlockedEvents = waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:infuraIsBlocked',
+              count: 0,
+              operation: async () => {
+                await controller.lookupNetwork();
+              },
+            });
+
+            expect(await promiseForNoInfuraIsBlockedEvents).toBeTruthy();
+          },
+        );
+      });
+    });
+
+    INFURA_NETWORKS.forEach(({ networkType, networkId }) => {
       describe(`when the type in the provider configuration is "${networkType}"`, () => {
-        describe('if the request for eth_blockNumber responds successfully', () => {
-          it('emits infuraIsUnblocked as long as the network has not changed by the time the request ends', async () => {
+        describe('if the request for eth_getBlockByNumber responds successfully', () => {
+          it('stores the fact that the network is available', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  // This results in a successful call to eth_getBlockByNumber
+                  // implicitly
+                  latestBlock: BLOCK,
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+                expect(controller.store.getState().networkStatus).toBe(
+                  'unknown',
+                );
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkStatus'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+
+                expect(controller.store.getState().networkStatus).toBe(
+                  'available',
+                );
+              },
+            );
+          });
+
+          it('stores the ID of the network', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  // This results in a successful call to eth_getBlockByNumber
+                  // implicitly
+                  latestBlock: BLOCK,
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+                expect(controller.store.getState().networkId).toBeNull();
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkId'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+
+                expect(controller.store.getState().networkId).toBe(networkId);
+              },
+            );
+          });
+
+          it('stores the fact that the network supports EIP-1559 when baseFeePerGas is in the block header', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                  networkDetails: {
+                    EIPS: {},
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  // This results in a successful call to eth_getBlockByNumber
+                  // implicitly
+                  latestBlock: POST_1559_BLOCK,
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkDetails'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+
+                expect(
+                  controller.store.getState().networkDetails.EIPS[1559],
+                ).toBeTruthy();
+              },
+            );
+          });
+
+          it('stores the fact that the network does not support EIP-1559 when baseFeePerGas is not in the block header', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                  networkDetails: {
+                    EIPS: {},
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  // This results in a successful call to eth_getBlockByNumber
+                  // implicitly
+                  latestBlock: PRE_1559_BLOCK,
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkDetails'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+
+                expect(
+                  controller.store.getState().networkDetails.EIPS[1559],
+                ).toBe(false);
+              },
+            );
+          });
+
+          it('emits infuraIsUnblocked', async () => {
             const messenger = buildMessenger();
 
             await withController(
@@ -1216,10 +1515,10 @@ describe('NetworkController', () => {
               },
               async ({ controller, network }) => {
                 network.mockEssentialRpcCalls({
-                  eth_blockNumber: {
-                    response: {
-                      result: '0x42',
-                    },
+                  eth_getBlockByNumber: {
+                    // This results in a successful call to eth_getBlockByNumber
+                    // implicitly
+                    latestBlock: POST_1559_BLOCK,
                   },
                 });
                 await withoutCallingLookupNetwork({
@@ -1241,8 +1540,894 @@ describe('NetworkController', () => {
               },
             );
           });
+        });
 
-          it('does not emit infuraIsUnblocked if the network has changed by the time the request ends', async () => {
+        describe('if the request for eth_blockNumber responds with a "countryBlocked" error', () => {
+          it('stores the fact that the network is blocked', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID
+                    // of the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: {
+                    response: BLOCKED_INFURA_RESPONSE,
+                  },
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkStatus'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+
+                expect(controller.store.getState().networkStatus).toBe(
+                  'blocked',
+                );
+              },
+            );
+          });
+
+          it('clears the ID of the network from state', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  // Ensure that each call to eth_blockNumber returns a
+                  // different block number, otherwise the first
+                  // eth_getBlockByNumber response will get cached under the
+                  // first block number
+                  eth_blockNumber: [
+                    {
+                      response: {
+                        result: '0x1',
+                      },
+                    },
+                    {
+                      response: {
+                        result: '0x2',
+                      },
+                    },
+                  ],
+                  eth_getBlockByNumber: [
+                    {
+                      request: {
+                        params: ['0x1', false],
+                      },
+                      response: SUCCESSFUL_ETH_GET_BLOCK_BY_NUMBER_RESPONSE,
+                    },
+                    {
+                      request: {
+                        params: ['0x2', false],
+                      },
+                      response: BLOCKED_INFURA_RESPONSE,
+                    },
+                  ],
+                });
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkId'],
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+                expect(controller.store.getState().networkId).toBe(networkId);
+
+                // Force the block tracker to request a new block to clear the
+                // block cache
+                clock.runAll();
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkId'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+                expect(controller.store.getState().networkId).toBeNull();
+              },
+            );
+          });
+
+          it('clears whether the network supports EIP-1559 from state', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                  networkDetails: {
+                    EIPS: {
+                      1559: true,
+                    },
+                    other: 'details',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: {
+                    response: BLOCKED_INFURA_RESPONSE,
+                  },
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkDetails'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+                expect(
+                  controller.store.getState().networkDetails,
+                ).toStrictEqual({
+                  EIPS: {
+                    1559: undefined,
+                  },
+                });
+              },
+            );
+          });
+
+          it('emits infuraIsBlocked', async () => {
+            const messenger = buildMessenger();
+
+            await withController(
+              {
+                messenger,
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID
+                    // of the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: {
+                    response: BLOCKED_INFURA_RESPONSE,
+                  },
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                const infuraIsBlocked = await waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsBlocked',
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+
+                expect(infuraIsBlocked).toBeTruthy();
+              },
+            );
+          });
+
+          it('does not emit infuraIsUnblocked', async () => {
+            const messenger = buildMessenger();
+
+            await withController(
+              {
+                messenger,
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID
+                    // of the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: {
+                    response: BLOCKED_INFURA_RESPONSE,
+                  },
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                const promiseForNoInfuraIsUnblockedEvents =
+                  waitForPublishedEvents({
+                    messenger,
+                    eventType: 'NetworkController:infuraIsUnblocked',
+                    count: 0,
+                    operation: async () => {
+                      await controller.lookupNetwork();
+                    },
+                  });
+
+                expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
+              },
+            );
+          });
+        });
+
+        describe('if the request for eth_getBlockByNumber responds with a generic error', () => {
+          it('stores the network status as unavailable if the error does not translate to an internal RPC error', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  net_version: {
+                    times: 2,
+                  },
+                  // Ensure that each call to eth_blockNumber returns a different
+                  // block number, otherwise the first eth_getBlockByNumber
+                  // response will get cached under the first block number
+                  eth_blockNumber: [
+                    {
+                      response: {
+                        result: '0x1',
+                      },
+                    },
+                    {
+                      response: {
+                        result: '0x2',
+                      },
+                    },
+                  ],
+                  eth_getBlockByNumber: [
+                    {
+                      request: {
+                        params: ['0x1', false],
+                      },
+                      response: SUCCESSFUL_ETH_GET_BLOCK_BY_NUMBER_RESPONSE,
+                    },
+                    {
+                      request: {
+                        params: ['0x2', false],
+                      },
+                      response: {
+                        error: 'some error',
+                        httpStatus: 405,
+                      },
+                    },
+                  ],
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkStatus'],
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+                expect(controller.store.getState().networkStatus).toBe(
+                  'available',
+                );
+
+                // Force the block tracker to request a new block to clear the
+                // block cache
+                clock.runAll();
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkStatus'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+                expect(controller.store.getState().networkStatus).toBe(
+                  'unavailable',
+                );
+              },
+            );
+          });
+
+          it('stores the network status as unknown if the error translates to an internal RPC error', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  net_version: {
+                    times: 2,
+                  },
+                  // Ensure that each call to eth_blockNumber returns a different
+                  // block number, otherwise the first eth_getBlockByNumber
+                  // response will get cached under the first block number
+                  eth_blockNumber: [
+                    {
+                      response: {
+                        result: '0x1',
+                      },
+                    },
+                    {
+                      response: {
+                        result: '0x2',
+                      },
+                    },
+                  ],
+                  eth_getBlockByNumber: [
+                    {
+                      request: {
+                        params: ['0x1', false],
+                      },
+                      response: SUCCESSFUL_ETH_GET_BLOCK_BY_NUMBER_RESPONSE,
+                    },
+                    {
+                      request: {
+                        params: ['0x2', false],
+                      },
+                      response: {
+                        error: 'some error',
+                        httpStatus: 500,
+                      },
+                    },
+                  ],
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkStatus'],
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+                expect(controller.store.getState().networkStatus).toBe(
+                  'available',
+                );
+
+                // Force the block tracker to request a new block to clear the
+                // block cache
+                clock.runAll();
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkStatus'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+                expect(controller.store.getState().networkStatus).toBe(
+                  'unknown',
+                );
+              },
+            );
+          });
+
+          it('clears the ID of the network from state', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: [
+                    {
+                      request: {
+                        params: ['0x1', false],
+                      },
+                      response: SUCCESSFUL_ETH_GET_BLOCK_BY_NUMBER_RESPONSE,
+                    },
+                    {
+                      request: {
+                        params: ['0x2', false],
+                      },
+                      response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                    },
+                  ],
+                  // Ensure that each call to eth_blockNumber returns a
+                  // different block number, otherwise the first
+                  // eth_getBlockByNumber response will get cached under the
+                  // first block number
+                  eth_blockNumber: [
+                    {
+                      response: {
+                        result: '0x1',
+                      },
+                    },
+                    {
+                      response: {
+                        result: '0x2',
+                      },
+                    },
+                  ],
+                });
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkId'],
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+                expect(controller.store.getState().networkId).toBe(networkId);
+
+                // Advance block tracker loop to force a fresh call to
+                // eth_getBlockByNumber
+                clock.runAll();
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkId'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+                expect(controller.store.getState().networkId).toBeNull();
+              },
+            );
+          });
+
+          it('clears whether the network supports EIP-1559 from state', async () => {
+            const intentionalErrorMessage =
+              'intentional error from eth_getBlockByNumber';
+
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                  networkDetails: {
+                    EIPS: {
+                      1559: true,
+                    },
+                    other: 'details',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: {
+                    response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                  },
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkDetails'],
+                  operation: async () => {
+                    try {
+                      await controller.lookupNetwork();
+                    } catch (error) {
+                      if (error !== intentionalErrorMessage) {
+                        console.error(error);
+                      }
+                    }
+                  },
+                });
+                expect(
+                  controller.store.getState().networkDetails,
+                ).toStrictEqual({
+                  EIPS: {
+                    1559: undefined,
+                  },
+                });
+              },
+            );
+          });
+
+          it('does not emit infuraIsBlocked', async () => {
+            const messenger = buildMessenger();
+
+            await withController(
+              {
+                messenger,
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: {
+                    response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                  },
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                const promiseForNoInfuraIsBlockedEvents =
+                  waitForPublishedEvents({
+                    messenger,
+                    eventType: 'NetworkController:infuraIsBlocked',
+                    count: 0,
+                    operation: async () => {
+                      await controller.lookupNetwork();
+                    },
+                  });
+
+                expect(await promiseForNoInfuraIsBlockedEvents).toBeTruthy();
+              },
+            );
+          });
+
+          it('does not emit infuraIsUnblocked', async () => {
+            const messenger = buildMessenger();
+
+            await withController(
+              {
+                messenger,
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                },
+              },
+              async ({ controller, network }) => {
+                network.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: {
+                    response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                  },
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                const promiseForNoInfuraIsUnblockedEvents =
+                  waitForPublishedEvents({
+                    messenger,
+                    eventType: 'NetworkController:infuraIsUnblocked',
+                    count: 0,
+                    operation: async () => {
+                      await controller.lookupNetwork();
+                    },
+                  });
+
+                expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
+              },
+            );
+          });
+        });
+
+        describe('if the network was switched after the eth_getBlockByNumber request started but before it completed', () => {
+          it('stores the network status of the second network, not the first', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                  networkConfigurations: {
+                    testNetworkConfigurationId: {
+                      id: 'testNetworkConfigurationId',
+                      type: 'rpc',
+                      rpcUrl: 'https://mock-rpc-url',
+                      chainId: '0x1337',
+                    },
+                  },
+                },
+              },
+              async ({ controller, network: network1 }) => {
+                network1.mockEssentialRpcCalls({
+                  net_version: {
+                    times: 2,
+                  },
+                  // Ensure that each call to eth_blockNumber returns a different
+                  // block number, otherwise the first eth_getBlockByNumber
+                  // response will get cached under the first block number
+                  eth_blockNumber: [
+                    {
+                      response: {
+                        result: '0x1',
+                      },
+                    },
+                    {
+                      response: {
+                        result: '0x2',
+                      },
+                    },
+                  ],
+                  eth_getBlockByNumber: [
+                    {
+                      request: {
+                        params: ['0x1', false],
+                      },
+                      response: {
+                        result: {
+                          ...BLOCK,
+                          number: '0x1',
+                        },
+                      },
+                    },
+                    {
+                      request: {
+                        params: ['0x2', false],
+                      },
+                      response: {
+                        result: {
+                          ...BLOCK,
+                          number: '0x2',
+                        },
+                      },
+                      beforeCompleting: async () => {
+                        await waitForStateChanges({
+                          controller,
+                          propertyPath: ['networkStatus'],
+                          operation: () => {
+                            controller.setActiveNetwork(
+                              'testNetworkConfigurationId',
+                            );
+                          },
+                        });
+                      },
+                    },
+                  ],
+                });
+                const network2 = new NetworkCommunications({
+                  networkClientType: 'custom',
+                  networkClientOptions: {
+                    customRpcUrl: 'https://mock-rpc-url',
+                  },
+                });
+                network2.mockEssentialRpcCalls({
+                  net_version: {
+                    response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                  },
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkStatus'],
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+                expect(controller.store.getState().networkStatus).toBe(
+                  'available',
+                );
+
+                // Force the block tracker to request a new block to clear the
+                // block cache
+                clock.runAll();
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkStatus'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+                expect(controller.store.getState().networkStatus).toBe(
+                  'unknown',
+                );
+              },
+            );
+          });
+
+          it('stores the ID of the second network, not the first', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                  networkConfigurations: {
+                    testNetworkConfigurationId: {
+                      id: 'testNetworkConfigurationId',
+                      type: 'rpc',
+                      rpcUrl: 'https://mock-rpc-url',
+                      chainId: '0x1337',
+                    },
+                  },
+                },
+              },
+              async ({ controller, network: network1 }) => {
+                network1.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: {
+                    beforeCompleting: async () => {
+                      await waitForStateChanges({
+                        controller,
+                        propertyPath: ['networkStatus'],
+                        operation: () => {
+                          controller.setActiveNetwork(
+                            'testNetworkConfigurationId',
+                          );
+                        },
+                      });
+                    },
+                    net_version: {
+                      response: {
+                        result: '111',
+                      },
+                    },
+                  },
+                });
+                const network2 = new NetworkCommunications({
+                  networkClientType: 'custom',
+                  networkClientOptions: {
+                    customRpcUrl: 'https://mock-rpc-url',
+                  },
+                });
+                network2.mockEssentialRpcCalls({
+                  net_version: {
+                    response: {
+                      result: '222',
+                    },
+                  },
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkId'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+
+                expect(controller.store.getState().networkId).toBe('222');
+              },
+            );
+          });
+
+          it('stores the EIP-1559 support of the second network, not the first', async () => {
+            await withController(
+              {
+                state: {
+                  provider: {
+                    type: networkType,
+                    // NOTE: This doesn't need to match the logical chain ID of
+                    // the network selected, it just needs to exist
+                    chainId: '0x9999999',
+                  },
+                  networkConfigurations: {
+                    testNetworkConfigurationId: {
+                      id: 'testNetworkConfigurationId',
+                      type: 'rpc',
+                      rpcUrl: 'https://mock-rpc-url',
+                      chainId: '0x1337',
+                    },
+                  },
+                },
+              },
+              async ({ controller, network: network1 }) => {
+                network1.mockEssentialRpcCalls({
+                  latestBlock: POST_1559_BLOCK,
+                  eth_getBlockByNumber: {
+                    beforeCompleting: async () => {
+                      await waitForStateChanges({
+                        controller,
+                        propertyPath: ['networkStatus'],
+                        operation: () => {
+                          controller.setActiveNetwork(
+                            'testNetworkConfigurationId',
+                          );
+                        },
+                      });
+                    },
+                  },
+                });
+                const network2 = new NetworkCommunications({
+                  networkClientType: 'custom',
+                  networkClientOptions: {
+                    customRpcUrl: 'https://mock-rpc-url',
+                  },
+                });
+                network2.mockEssentialRpcCalls({
+                  latestBlock: PRE_1559_BLOCK,
+                });
+                await withoutCallingLookupNetwork({
+                  controller,
+                  operation: async () => {
+                    await controller.initializeProvider();
+                  },
+                });
+
+                await waitForStateChanges({
+                  controller,
+                  propertyPath: ['networkDetails'],
+                  operation: async () => {
+                    await controller.lookupNetwork();
+                  },
+                });
+
+                expect(
+                  controller.store.getState().networkDetails,
+                ).toStrictEqual({
+                  EIPS: {
+                    1559: false,
+                  },
+                });
+              },
+            );
+          });
+
+          it('emits infuraIsBlocked, not infuraIsUnblocked, if the second network is blocked, even if the first one is not', async () => {
             const anotherNetwork = INFURA_NETWORKS.find(
               (network) => network.networkType !== networkType,
             );
@@ -1269,17 +2454,15 @@ describe('NetworkController', () => {
               },
               async ({ controller, network: network1 }) => {
                 network1.mockEssentialRpcCalls({
-                  eth_blockNumber: {
-                    response: {
-                      result: '0x42',
-                    },
+                  eth_getBlockByNumber: {
                     beforeCompleting: async () => {
                       await waitForPublishedEvents({
                         messenger,
                         eventType: 'NetworkController:networkDidChange',
                         operation: async () => {
-                          await withoutCallingLookupNetwork({
+                          await waitForStateChanges({
                             controller,
+                            propertyPath: ['networkStatus'],
                             operation: () => {
                               controller.setProviderType(
                                 anotherNetwork.networkType,
@@ -1292,55 +2475,14 @@ describe('NetworkController', () => {
                   },
                 });
                 const network2 = network1.with({
+                  networkClientType: 'infura',
                   networkClientOptions: {
                     infuraNetwork: anotherNetwork.networkType,
                   },
                 });
-                network2.mockEssentialRpcCalls();
-                await withoutCallingLookupNetwork({
-                  controller,
-                  operation: async () => {
-                    await controller.initializeProvider();
-                  },
-                });
-
-                const promiseForInfuraIsUnblocked = waitForPublishedEvents({
-                  messenger,
-                  eventType: 'NetworkController:infuraIsUnblocked',
-                  operation: async () => {
-                    await controller.lookupNetwork();
-                  },
-                });
-
-                await expect(promiseForInfuraIsUnblocked).toNeverResolve();
-              },
-            );
-          });
-        });
-
-        describe('if the request for eth_blockNumber responds with a "countryBlocked" error', () => {
-          it('emits infuraIsBlocked as long as the network has not changed by the time the request ends', async () => {
-            const messenger = buildMessenger();
-
-            await withController(
-              {
-                messenger,
-                state: {
-                  provider: {
-                    type: networkType,
-                    // NOTE: This doesn't need to match the logical chain ID
-                    // of the network selected, it just needs to exist
-                    chainId: '0x9999999',
-                  },
-                },
-              },
-              async ({ controller, network }) => {
-                network.mockEssentialRpcCalls({
-                  eth_blockNumber: {
-                    response: {
-                      httpStatus: 500,
-                      error: 'countryBlocked',
-                    },
+                network2.mockEssentialRpcCalls({
+                  eth_getBlockByNumber: {
+                    response: BLOCKED_INFURA_RESPONSE,
                   },
                 });
                 await withoutCallingLookupNetwork({
@@ -1349,650 +2491,89 @@ describe('NetworkController', () => {
                     await controller.initializeProvider();
                   },
                 });
-
-                const infuraIsBlocked = await waitForPublishedEvents({
-                  messenger,
-                  eventType: 'NetworkController:infuraIsBlocked',
-                  operation: async () => {
-                    await controller.lookupNetwork();
-                  },
-                });
-
-                expect(infuraIsBlocked).toBeTruthy();
-              },
-            );
-          });
-
-          it('does not emit infuraIsBlocked if the network has changed by the time the request ends', async () => {
-            const messenger = buildMessenger();
-
-            await withController(
-              {
-                messenger,
-                state: {
-                  provider: {
-                    type: networkType,
-                    // NOTE: This doesn't need to match the logical chain ID
-                    // of the network selected, it just needs to exist
-                    chainId: '0x9999999',
-                  },
-                  networkConfigurations: {
-                    testNetworkConfigurationId: {
-                      id: 'testNetworkConfigurationId',
-                      rpcUrl: 'https://mock-rpc-url',
-                      chainId: '0xtest',
-                      ticker: 'TEST',
-                    },
-                  },
-                },
-              },
-              async ({ controller, network: network1 }) => {
-                network1.mockEssentialRpcCalls({
-                  eth_blockNumber: {
-                    response: {
-                      httpStatus: 500,
-                      error: 'countryBlocked',
-                    },
-                    beforeCompleting: async () => {
-                      await withoutCallingLookupNetwork({
-                        controller,
-                        operation: async () => {
-                          await waitForPublishedEvents({
-                            messenger,
-                            eventType: 'NetworkController:networkDidChange',
-                            operation: () => {
-                              controller.setActiveNetwork(
-                                'testNetworkConfigurationId',
-                              );
-                            },
-                          });
-                        },
-                      });
-                    },
-                  },
-                });
-                const network2 = new NetworkCommunications({
-                  networkClientType: 'rpc',
-                  networkClientOptions: {
-                    customRpcUrl: 'https://mock-rpc-url',
-                  },
-                });
-                network2.mockEssentialRpcCalls();
-                await withoutCallingLookupNetwork({
-                  controller,
-                  operation: async () => {
-                    await controller.initializeProvider();
-                  },
-                });
-
+                const promiseForNoInfuraIsUnblockedEvents =
+                  waitForPublishedEvents({
+                    messenger,
+                    eventType: 'NetworkController:infuraIsUnblocked',
+                    count: 0,
+                  });
                 const promiseForInfuraIsBlocked = waitForPublishedEvents({
                   messenger,
                   eventType: 'NetworkController:infuraIsBlocked',
-                  operation: async () => {
-                    await controller.lookupNetwork();
-                  },
                 });
 
-                await expect(promiseForInfuraIsBlocked).toNeverResolve();
-              },
-            );
-          });
-        });
-
-        describe('if the request for eth_blockNumber responds with a generic error', () => {
-          it('does not emit infuraIsUnblocked', async () => {
-            const messenger = buildMessenger();
-
-            await withController(
-              {
-                messenger,
-                state: {
-                  provider: {
-                    type: networkType,
-                    // NOTE: This doesn't need to match the logical chain ID
-                    // of the network selected, it just needs to exist
-                    chainId: '0x9999999',
-                  },
-                },
-              },
-              async ({ controller, network }) => {
-                network.mockEssentialRpcCalls({
-                  eth_blockNumber: {
-                    response: {
-                      httpStatus: 500,
-                      error: 'oops',
-                    },
-                  },
-                });
-                await withoutCallingLookupNetwork({
-                  controller,
-                  operation: async () => {
-                    await controller.initializeProvider();
-                  },
-                });
-
-                const promiseForInfuraIsUnblocked = waitForPublishedEvents({
-                  messenger,
-                  eventType: 'NetworkController:infuraIsUnblocked',
-                  operation: async () => {
-                    await controller.lookupNetwork();
-                  },
-                });
-
-                await expect(promiseForInfuraIsUnblocked).toNeverResolve();
-              },
-            );
-          });
-        });
-
-        it(`persists "${networkVersion}" to state as the network version of ${nickname}`, async () => {
-          await withController(
-            {
-              state: {
-                provider: {
-                  type: networkType,
-                  // NOTE: This doesn't need to match the logical chain ID of
-                  // the network selected, it just needs to exist
-                  chainId: '0x9999999',
-                },
-              },
-            },
-            async ({ controller, network }) => {
-              network.mockEssentialRpcCalls();
-              await withoutCallingLookupNetwork({
-                controller,
-                operation: async () => {
-                  await controller.initializeProvider();
-                },
-              });
-
-              await waitForStateChanges({
-                controller,
-                propertyPath: ['network'],
-                operation: async () => {
-                  await controller.lookupNetwork();
-                },
-              });
-
-              expect(controller.store.getState().network).toBe(networkVersion);
-            },
-          );
-        });
-
-        it(`does not update the network state if it is already set to "${networkVersion}"`, async () => {
-          await withController(
-            {
-              state: {
-                provider: {
-                  type: networkType,
-                  // NOTE: This doesn't need to match the logical chain ID of
-                  // the network selected, it just needs to exist
-                  chainId: '0x9999999',
-                },
-              },
-            },
-            async ({ controller, network }) => {
-              network.mockEssentialRpcCalls({
-                eth_blockNumber: {
-                  times: 2,
-                },
-              });
-              await withoutCallingLookupNetwork({
-                controller,
-                operation: async () => {
-                  await controller.initializeProvider();
-                },
-              });
-
-              await waitForStateChanges({
-                controller,
-                propertyPath: ['network'],
-                operation: async () => {
-                  await controller.lookupNetwork();
-                },
-              });
-
-              const promiseForStateChanges = waitForStateChanges({
-                controller,
-                propertyPath: ['network'],
-                operation: async () => {
-                  await controller.lookupNetwork();
-                },
-              });
-
-              await expect(promiseForStateChanges).toNeverResolve();
-            },
-          );
-        });
-
-        describe('if the request for eth_getBlockByNumber responds successfully', () => {
-          it('persists to state that the network supports EIP-1559 when baseFeePerGas is in the block header', async () => {
-            await withController(
-              {
-                state: {
-                  provider: {
-                    type: networkType,
-                    // NOTE: This doesn't need to match the logical chain ID of
-                    // the network selected, it just needs to exist
-                    chainId: '0x9999999',
-                  },
-                  networkDetails: {
-                    EIPS: {},
-                  },
-                },
-              },
-              async ({ controller, network }) => {
-                network.mockEssentialRpcCalls({
-                  latestBlock: POST_1559_BLOCK,
-                });
-                await controller.initializeProvider();
-
-                await controller.getEIP1559Compatibility();
-
-                expect(
-                  controller.store.getState().networkDetails.EIPS[1559],
-                ).toBe(true);
-              },
-            );
-          });
-
-          it('persists to state that the network does not support EIP-1559 when baseFeePerGas is not in the block header', async () => {
-            await withController(
-              {
-                state: {
-                  provider: {
-                    type: networkType,
-                    // NOTE: This doesn't need to match the logical chain ID of
-                    // the network selected, it just needs to exist
-                    chainId: '0x9999999',
-                  },
-                  networkDetails: {
-                    EIPS: {},
-                  },
-                },
-              },
-              async ({ controller, network }) => {
-                network.mockEssentialRpcCalls({
-                  latestBlock: PRE_1559_BLOCK,
-                });
-                await controller.initializeProvider();
-
-                await controller.getEIP1559Compatibility();
-
-                expect(
-                  controller.store.getState().networkDetails.EIPS[1559],
-                ).toBe(false);
-              },
-            );
-          });
-        });
-
-        describe('if the request for eth_getBlockByNumber responds with an error', () => {
-          it('does not update the network details in any way', async () => {
-            const intentionalErrorMessage =
-              'intentional error from eth_getBlockByNumber';
-
-            await withController(
-              {
-                state: {
-                  provider: {
-                    type: networkType,
-                    // NOTE: This doesn't need to match the logical chain ID of
-                    // the network selected, it just needs to exist
-                    chainId: '0x9999999',
-                  },
-                  networkDetails: {
-                    EIPS: {},
-                  },
-                },
-              },
-              async ({ controller, network }) => {
-                network.mockEssentialRpcCalls({
-                  eth_getBlockByNumber: {
-                    response: {
-                      error: intentionalErrorMessage,
-                    },
-                  },
-                });
-                await withoutCallingGetEIP1559Compatibility({
-                  controller,
-                  operation: async () => {
-                    await controller.initializeProvider();
-                  },
-                });
-                expect(
-                  controller.store.getState().networkDetails.EIPS['1559'],
-                ).toBeUndefined();
-
-                await waitForStateChanges({
-                  controller,
-                  propertyPath: ['networkDetails'],
-                  count: 0,
-                  operation: async () => {
-                    try {
-                      await controller.getEIP1559Compatibility();
-                    } catch (error) {
-                      if (error !== intentionalErrorMessage) {
-                        console.error(error);
-                      }
-                    }
-                  },
-                });
-                expect(
-                  controller.store.getState().networkDetails.EIPS['1559'],
-                ).toBeUndefined();
-              },
-            );
-          });
-        });
-
-        describe('if the network was switched after the net_version request started but before it completed', () => {
-          it(`persists to state the network version of the newly switched network, not the initial one for ${nickname}`, async () => {
-            const oldNetworkVersion = networkVersion;
-            const newChainName = 'goerli';
-            const newNetworkVersion = '5';
-
-            await withController(
-              {
-                state: {
-                  provider: {
-                    type: networkType,
-                    // NOTE: This doesn't need to match the logical chain ID of
-                    // the network selected, it just needs to exist
-                    chainId: '0x9999999',
-                  },
-                },
-              },
-              async ({ controller }) => {
-                let netVersionCallCount = 0;
-
-                const fakeProviders = [
-                  {
-                    sendAsync(request, callback) {
-                      if (request.method === 'net_version') {
-                        netVersionCallCount += 1;
-                        if (netVersionCallCount === 1) {
-                          waitForStateChanges({
-                            controller,
-                            propertyPath: ['network'],
-                            operation: () => {
-                              controller.setProviderType(newChainName);
-                            },
-                          })
-                            .then(() => {
-                              callback(null, {
-                                id: request.id,
-                                jsonrpc: '2.0',
-                                result: oldNetworkVersion,
-                              });
-                            })
-                            .catch((error) => {
-                              throw error;
-                            });
-                          return;
-                        }
-
-                        throw new Error(
-                          "net_version shouldn't be called more than once",
-                        );
-                      }
-
-                      if (request.method === 'eth_getBlockByNumber') {
-                        callback(null, {
-                          id: request.id,
-                          jsonrpc: '2.0',
-                          result: BLOCK,
-                        });
-                        return;
-                      }
-
-                      throw new Error(
-                        `Mock not found for method ${request.method}`,
-                      );
-                    },
-                  },
-                  {
-                    sendAsync(request, callback) {
-                      if (request.method === 'net_version') {
-                        callback(null, {
-                          id: request.id,
-                          jsonrpc: '2.0',
-                          result: newNetworkVersion,
-                        });
-                        return;
-                      }
-
-                      if (request.method === 'eth_getBlockByNumber') {
-                        callback(null, {
-                          id: request.id,
-                          jsonrpc: '2.0',
-                          result: BLOCK,
-                        });
-                        return;
-                      }
-
-                      throw new Error(
-                        `Mock not found for method ${request.method}`,
-                      );
-                    },
-                  },
-                ];
-                jest
-                  .spyOn(ethJsonRpcProvider, 'providerFromEngine')
-                  .mockImplementationOnce(() => fakeProviders[0])
-                  .mockImplementationOnce(() => fakeProviders[1]);
-                await withoutCallingLookupNetwork({
-                  controller,
-                  operation: async () => {
-                    await controller.initializeProvider();
-                  },
-                });
-
-                await waitForStateChanges({
-                  controller,
-                  propertyPath: ['network'],
-                  operation: async () => {
-                    await controller.lookupNetwork();
-                  },
-                });
-
-                expect(controller.store.getState().network).toBe(
-                  newNetworkVersion,
-                );
-              },
-            );
-          });
-
-          it(`persists to state the EIP-1559 support for the newly switched network, not the initial one for ${nickname}`, async () => {
-            const oldNetworkVersion = networkVersion;
-            const newChainName = 'goerli';
-            const newNetworkVersion = '5';
-
-            await withController(
-              {
-                state: {
-                  provider: {
-                    type: networkType,
-                    // NOTE: This doesn't need to match the logical chain ID of
-                    // the network selected, it just needs to exist
-                    chainId: '0x9999999',
-                  },
-                },
-              },
-              async ({ controller }) => {
-                let netVersionCallCount = 0;
-
-                const fakeProviders = [
-                  {
-                    sendAsync(request, callback) {
-                      if (request.method === 'net_version') {
-                        netVersionCallCount += 1;
-                        if (netVersionCallCount === 1) {
-                          waitForStateChanges({
-                            controller,
-                            propertyPath: ['network'],
-                            operation: () => {
-                              controller.setProviderType(newChainName);
-                            },
-                          })
-                            .then(() => {
-                              callback(null, {
-                                id: request.id,
-                                jsonrpc: '2.0',
-                                result: oldNetworkVersion,
-                              });
-                            })
-                            .catch((error) => {
-                              throw error;
-                            });
-                          return;
-                        }
-
-                        throw new Error(
-                          "net_version shouldn't be called more than once",
-                        );
-                      }
-
-                      if (request.method === 'eth_getBlockByNumber') {
-                        callback(null, {
-                          id: request.id,
-                          jsonrpc: '2.0',
-                          result: POST_1559_BLOCK,
-                        });
-                        return;
-                      }
-
-                      throw new Error(
-                        `Mock not found for method ${request.method}`,
-                      );
-                    },
-                  },
-                  {
-                    sendAsync(request, callback) {
-                      if (request.method === 'net_version') {
-                        callback(null, {
-                          id: request.id,
-                          jsonrpc: '2.0',
-                          result: newNetworkVersion,
-                        });
-                        return;
-                      }
-
-                      if (request.method === 'eth_getBlockByNumber') {
-                        callback(null, {
-                          id: request.id,
-                          jsonrpc: '2.0',
-                          result: PRE_1559_BLOCK,
-                        });
-                        return;
-                      }
-
-                      throw new Error(
-                        `Mock not found for method ${request.method}`,
-                      );
-                    },
-                  },
-                ];
-                jest
-                  .spyOn(ethJsonRpcProvider, 'providerFromEngine')
-                  .mockImplementationOnce(() => fakeProviders[0])
-                  .mockImplementationOnce(() => fakeProviders[1]);
-                await withoutCallingLookupNetwork({
-                  controller,
-                  operation: async () => {
-                    await controller.initializeProvider();
-                  },
-                });
-
-                await waitForStateChanges({
-                  controller,
-                  propertyPath: ['networkDetails'],
-                  operation: async () => {
-                    await controller.lookupNetwork();
-                  },
-                });
-
-                expect(
-                  controller.store.getState().networkDetails.EIPS['1559'],
-                ).toBe(false);
-              },
-            );
-          });
-        });
-      });
-    }
-
-    describe(`when the type in the provider configuration is "rpc"`, () => {
-      it('emits infuraIsUnblocked', async () => {
-        const messenger = buildMessenger();
-
-        await withController(
-          {
-            messenger,
-            state: {
-              provider: {
-                type: 'rpc',
-                rpcUrl: 'https://mock-rpc-url',
-                chainId: '0xtest',
-                ticker: 'TEST',
-                id: 'testNetworkConfigurationId',
-              },
-              networkConfigurations: {
-                testNetworkConfigurationId: {
-                  rpcUrl: 'https://mock-rpc-url',
-                  chainId: '0xtest',
-                  ticker: 'TEST',
-                  id: 'testNetworkConfigurationId',
-                },
-              },
-            },
-          },
-          async ({ controller, network }) => {
-            network.mockEssentialRpcCalls();
-            await withoutCallingLookupNetwork({
-              controller,
-              operation: async () => {
-                await controller.initializeProvider();
-              },
-            });
-
-            const infuraIsUnblocked = await waitForPublishedEvents({
-              messenger,
-              eventType: 'NetworkController:infuraIsUnblocked',
-              operation: async () => {
                 await controller.lookupNetwork();
+
+                expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
+                expect(await promiseForInfuraIsBlocked).toBeTruthy();
               },
-            });
-
-            expect(infuraIsUnblocked).toBeTruthy();
-          },
-        );
+            );
+          });
+        });
       });
+    });
 
-      describe('if the request for net_version responds successfully', () => {
-        it('persists the network version to state', async () => {
+    describe('when the type in the provider configuration is "rpc"', () => {
+      describe('if both net_version and eth_getBlockByNumber respond successfully', () => {
+        it('stores the fact the network is available', async () => {
           await withController(
             {
               state: {
                 provider: {
                   type: 'rpc',
                   rpcUrl: 'https://mock-rpc-url',
-                  chainId: '0xtest',
-                  ticker: 'TEST',
-                  id: 'testNetworkConfigurationId',
-                },
-                networkConfigurations: {
-                  testNetworkConfigurationId: {
-                    rpcUrl: 'https://mock-rpc-url',
-                    chainId: '0xtest',
-                    ticker: 'TEST',
-                    id: 'testNetworkConfigurationId',
-                  },
+                  chainId: '0x1337',
                 },
               },
             },
             async ({ controller, network }) => {
               network.mockEssentialRpcCalls({
+                net_version: {
+                  response: SUCCESSFUL_NET_VERSION_RESPONSE,
+                },
+                eth_getBlockByNumber: {
+                  response: SUCCESSFUL_ETH_GET_BLOCK_BY_NUMBER_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe('unknown');
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
+            },
+          );
+        });
+
+        it('stores the ID of the network', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                // This results in a successful call to eth_getBlockByNumber
+                // implicitly
+                latestBlock: POST_1559_BLOCK,
                 net_version: {
                   response: {
                     result: '42',
@@ -2005,48 +2586,39 @@ describe('NetworkController', () => {
                   await controller.initializeProvider();
                 },
               });
+              expect(controller.store.getState().networkId).toBe(null);
 
               await waitForStateChanges({
                 controller,
-                propertyPath: ['network'],
+                propertyPath: ['networkId'],
                 operation: async () => {
                   await controller.lookupNetwork();
                 },
               });
 
-              expect(controller.store.getState().network).toBe('42');
+              expect(controller.store.getState().networkId).toBe('42');
             },
           );
         });
 
-        it('does not persist the result of net_version if it matches what is already in state', async () => {
+        it('stores the fact that the network supports EIP-1559 when baseFeePerGas is in the block header', async () => {
           await withController(
             {
               state: {
                 provider: {
                   type: 'rpc',
                   rpcUrl: 'https://mock-rpc-url',
-                  chainId: '0xtest',
-                  ticker: 'TEST',
-                  id: 'testNetworkConfigurationId',
-                },
-                networkConfigurations: {
-                  testNetworkConfigurationId: {
-                    rpcUrl: 'https://mock-rpc-url',
-                    chainId: '0xtest',
-                    ticker: 'TEST',
-                    id: 'testNetworkConfigurationId',
-                  },
+                  chainId: '0x1337',
                 },
               },
             },
             async ({ controller, network }) => {
               network.mockEssentialRpcCalls({
+                // This results in a successful call to eth_getBlockByNumber
+                // implicitly
+                latestBlock: POST_1559_BLOCK,
                 net_version: {
-                  times: 2,
-                },
-                eth_blockNumber: {
-                  times: 2,
+                  response: SUCCESSFUL_NET_VERSION_RESPONSE,
                 },
               });
               await withoutCallingLookupNetwork({
@@ -2056,295 +2628,6 @@ describe('NetworkController', () => {
                 },
               });
 
-              await waitForStateChanges({
-                controller,
-                propertyPath: ['network'],
-                operation: async () => {
-                  await controller.lookupNetwork();
-                },
-              });
-
-              const promiseForStateChanges = waitForStateChanges({
-                controller,
-                propertyPath: ['network'],
-                operation: async () => {
-                  await controller.lookupNetwork();
-                },
-              });
-
-              await expect(promiseForStateChanges).toNeverResolve();
-            },
-          );
-        });
-
-        describe('if the request for eth_getBlockByNumber responds successfully', () => {
-          it('persists to state that the network supports EIP-1559 when baseFeePerGas is in the block header', async () => {
-            await withController(
-              {
-                state: {
-                  provider: {
-                    type: 'rpc',
-                    rpcUrl: 'https://mock-rpc-url',
-                    chainId: '0xtest',
-                    ticker: 'TEST',
-                    id: 'testNetworkConfigurationId',
-                  },
-                  networkConfigurations: {
-                    testNetworkConfigurationId: {
-                      rpcUrl: 'https://mock-rpc-url',
-                      chainId: '0xtest',
-                      ticker: 'TEST',
-                      id: 'testNetworkConfigurationId1',
-                    },
-                  },
-                },
-              },
-              async ({ controller, network }) => {
-                network.mockEssentialRpcCalls({
-                  latestBlock: POST_1559_BLOCK,
-                });
-                await withoutCallingLookupNetwork({
-                  controller,
-                  operation: async () => {
-                    await controller.initializeProvider();
-                  },
-                });
-
-                await controller.lookupNetwork();
-
-                expect(
-                  controller.store.getState().networkDetails.EIPS[1559],
-                ).toBe(true);
-              },
-            );
-          });
-
-          it('persists to state that the network does not support EIP-1559 when baseFeePerGas is not in the block header', async () => {
-            await withController(
-              {
-                state: {
-                  provider: {
-                    type: 'rpc',
-                    rpcUrl: 'https://mock-rpc-url-2',
-                    chainId: '0x1337',
-                    ticker: 'TEST2',
-                    id: 'testNetworkConfigurationId',
-                  },
-                  networkConfigurations: {
-                    testNetworkConfigurationId: {
-                      rpcUrl: 'https://mock-rpc-url-2',
-                      chainId: '0x1337',
-                      ticker: 'TEST2',
-                      id: 'testNetworkConfigurationId',
-                    },
-                  },
-                  networkDetails: {
-                    EIPS: {},
-                  },
-                },
-              },
-
-              async ({ controller, network }) => {
-                network.mockEssentialRpcCalls({
-                  latestBlock: PRE_1559_BLOCK,
-                });
-                await withoutCallingLookupNetwork({
-                  controller,
-                  operation: async () => {
-                    await controller.initializeProvider();
-                  },
-                });
-
-                await controller.lookupNetwork();
-
-                expect(
-                  controller.store.getState().networkDetails.EIPS[1559],
-                ).toBe(false);
-              },
-            );
-          });
-        });
-
-        describe('if the request for eth_getBlockByNumber responds with an error', () => {
-          it('does not update the network details in any way', async () => {
-            const intentionalErrorMessage =
-              'intentional error from eth_getBlockByNumber';
-
-            await withController(
-              {
-                state: {
-                  provider: {
-                    type: 'rpc',
-                    rpcUrl: 'https://mock-rpc-url',
-                    chainId: '0x1337',
-                    ticker: 'TEST',
-                    id: 'testNetworkConfigurationId',
-                  },
-                  networkConfigurations: {
-                    testNetworkConfigurationId: {
-                      rpcUrl: 'https://mock-rpc-url',
-                      chainId: '0x1337',
-                      ticker: 'TEST',
-                      id: 'testNetworkConfigurationId',
-                    },
-                  },
-                  networkDetails: {
-                    EIPS: {},
-                  },
-                },
-              },
-              async ({ controller, network }) => {
-                network.mockEssentialRpcCalls({
-                  eth_getBlockByNumber: {
-                    response: {
-                      error: intentionalErrorMessage,
-                    },
-                  },
-                });
-                await withoutCallingLookupNetwork({
-                  controller,
-                  operation: async () => {
-                    await controller.initializeProvider();
-                  },
-                });
-                expect(
-                  controller.store.getState().networkDetails.EIPS['1559'],
-                ).toBeUndefined();
-
-                await waitForStateChanges({
-                  controller,
-                  propertyPath: ['networkDetails'],
-                  count: 0,
-                  operation: async () => {
-                    try {
-                      await controller.lookupNetwork();
-                    } catch (error) {
-                      if (
-                        !('data' in error) ||
-                        error.data !== intentionalErrorMessage
-                      ) {
-                        console.error(error);
-                      }
-                    }
-                  },
-                });
-                expect(
-                  controller.store.getState().networkDetails.EIPS['1559'],
-                ).toBeUndefined();
-              },
-            );
-          });
-        });
-      });
-
-      describe('if the request for net_version responds with an error', () => {
-        it('resets the network status to "loading"', async () => {
-          const intentionalErrorMessage = 'intentional error from net_version';
-
-          await withController(
-            {
-              state: {
-                provider: {
-                  type: 'rpc',
-                  rpcUrl: 'https://mock-rpc-url',
-                  chainId: '0xtest',
-                  ticker: 'TEST',
-                  id: 'testNetworkConfigurationId',
-                },
-                networkConfigurations: {
-                  testNetworkConfigurationId: {
-                    rpcUrl: 'https://mock-rpc-url',
-                    chainId: '0xtest',
-                    ticker: 'TEST',
-                    id: 'testNetworkConfigurationId',
-                  },
-                },
-              },
-            },
-            async ({ controller, network }) => {
-              network.mockEssentialRpcCalls({
-                net_version: [
-                  {
-                    response: {
-                      result: '42',
-                    },
-                  },
-                  {
-                    response: {
-                      error: intentionalErrorMessage,
-                    },
-                  },
-                ],
-              });
-              await controller.initializeProvider();
-              expect(controller.store.getState().network).toBe('42');
-
-              await waitForStateChanges({
-                controller,
-                propertyPath: ['network'],
-                operation: async () => {
-                  try {
-                    await controller.lookupNetwork();
-                  } catch (error) {
-                    if (error !== intentionalErrorMessage) {
-                      console.error(error);
-                    }
-                  }
-                },
-              });
-
-              expect(controller.store.getState().network).toBe('loading');
-            },
-          );
-        });
-
-        it('removes from state whether the network supports EIP-1559', async () => {
-          await withController(
-            {
-              state: {
-                provider: {
-                  type: 'rpc',
-                  rpcUrl: 'https://mock-rpc-url',
-                  chainId: '0xtest',
-                  ticker: 'TEST',
-                  id: 'testNetworkConfigurationId',
-                },
-                networkConfigurations: {
-                  testNetworkConfigurationId: {
-                    rpcUrl: 'https://mock-rpc-url',
-                    chainId: '0xtest',
-                    ticker: 'TEST',
-                    id: 'testNetworkConfigurationId',
-                  },
-                },
-                networkDetails: {
-                  EIPS: {},
-                },
-              },
-            },
-            async ({ controller, network }) => {
-              network.mockEssentialRpcCalls({
-                latestBlock: POST_1559_BLOCK,
-                net_version: [
-                  {
-                    response: {
-                      result: '42',
-                    },
-                  },
-                  {
-                    response: {
-                      error: 'oops',
-                    },
-                  },
-                ],
-              });
-              await controller.initializeProvider();
-              expect(controller.store.getState().networkDetails).toStrictEqual({
-                EIPS: {
-                  1559: true,
-                },
-              });
-
               await waitForStateChanges({
                 controller,
                 propertyPath: ['networkDetails'],
@@ -2353,6 +2636,306 @@ describe('NetworkController', () => {
                 },
               });
 
+              expect(
+                controller.store.getState().networkDetails.EIPS[1559],
+              ).toBeTruthy();
+            },
+          );
+        });
+
+        it('stores the fact that the network does not support EIP-1559 when baseFeePerGas is not in the block header', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                // This results in a successful call to eth_getBlockByNumber
+                // implicitly
+                latestBlock: PRE_1559_BLOCK,
+                net_version: {
+                  response: SUCCESSFUL_NET_VERSION_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkDetails'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(
+                controller.store.getState().networkDetails.EIPS[1559],
+              ).toBe(false);
+            },
+          );
+        });
+
+        it('emits infuraIsUnblocked', async () => {
+          const messenger = buildMessenger();
+
+          await withController(
+            {
+              messenger,
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                // This results in a successful call to eth_getBlockByNumber
+                // implicitly
+                latestBlock: PRE_1559_BLOCK,
+                net_version: {
+                  response: SUCCESSFUL_NET_VERSION_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              const infuraIsUnblocked = await waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsUnblocked',
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(infuraIsUnblocked).toBeTruthy();
+            },
+          );
+        });
+      });
+
+      describe('if the request for eth_getBlockByNumber responds successfully, but the request for net_version responds with a generic error', () => {
+        it('stores the network status as available if the error does not translate to an internal RPC error', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                net_version: [
+                  {
+                    response: SUCCESSFUL_NET_VERSION_RESPONSE,
+                  },
+                  {
+                    response: {
+                      error: 'some error',
+                      httpStatus: 405,
+                    },
+                  },
+                ],
+                eth_blockNumber: {
+                  times: 2,
+                },
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
+
+              // Force the block tracker to request a new block to clear the
+              // block cache
+              clock.runAll();
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe(
+                'unavailable',
+              );
+            },
+          );
+        });
+
+        it('stores the network status as unknown if the error translates to an internal RPC error', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                net_version: [
+                  {
+                    response: SUCCESSFUL_NET_VERSION_RESPONSE,
+                  },
+                  {
+                    response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                  },
+                ],
+                eth_blockNumber: {
+                  times: 2,
+                },
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
+
+              // Force the block tracker to request a new block to clear the
+              // block cache
+              clock.runAll();
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe('unknown');
+            },
+          );
+        });
+
+        it('clears the ID of the network from state', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                // This results in a successful call to eth_getBlockByNumber
+                // implicitly
+                latestBlock: BLOCK,
+                net_version: [
+                  {
+                    response: {
+                      result: '42',
+                    },
+                  },
+                  {
+                    response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                  },
+                ],
+                eth_blockNumber: {
+                  times: 2,
+                },
+              });
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkId'],
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              expect(controller.store.getState().networkId).toBe('42');
+
+              // Advance block tracker loop to force a fresh call to
+              // eth_getBlockByNumber
+              clock.runAll();
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkId'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+              expect(controller.store.getState().networkId).toBeNull();
+            },
+          );
+        });
+
+        it('clears whether the network supports EIP-1559 from state', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+                networkDetails: {
+                  EIPS: {
+                    1559: true,
+                  },
+                  other: 'details',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                // This results in a successful call to eth_getBlockByNumber
+                // implicitly
+                latestBlock: BLOCK,
+                net_version: {
+                  response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkDetails'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
               expect(controller.store.getState().networkDetails).toStrictEqual({
                 EIPS: {
                   1559: undefined,
@@ -2361,10 +2944,467 @@ describe('NetworkController', () => {
             },
           );
         });
+
+        it('does not emit infuraIsBlocked', async () => {
+          const messenger = buildMessenger();
+
+          await withController(
+            {
+              messenger,
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                // This results in a successful call to eth_getBlockByNumber
+                // implicitly
+                latestBlock: BLOCK,
+                net_version: {
+                  response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              const promiseForNoInfuraIsBlockedEvents = waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsBlocked',
+                count: 0,
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(await promiseForNoInfuraIsBlockedEvents).toBeTruthy();
+            },
+          );
+        });
+
+        it('emits infuraIsUnblocked', async () => {
+          const messenger = buildMessenger();
+
+          await withController(
+            {
+              messenger,
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                // This results in a successful call to eth_getBlockByNumber
+                // implicitly
+                latestBlock: BLOCK,
+                net_version: {
+                  response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              const infuraIsUnblocked = await waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsUnblocked',
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(infuraIsUnblocked).toBeTruthy();
+            },
+          );
+        });
+      });
+
+      describe('if the request for net_version responds successfully, but the request for eth_getBlockByNumber responds with a generic error', () => {
+        it('stores the fact that the network is unavailable', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                net_version: {
+                  times: 2,
+                },
+                // Ensure that each call to eth_blockNumber returns a different
+                // block number, otherwise the first eth_getBlockByNumber
+                // response will get cached under the first block number
+                eth_blockNumber: [
+                  {
+                    response: {
+                      result: '0x1',
+                    },
+                  },
+                  {
+                    response: {
+                      result: '0x2',
+                    },
+                  },
+                ],
+                eth_getBlockByNumber: [
+                  {
+                    request: {
+                      params: ['0x1', false],
+                    },
+                    response: SUCCESSFUL_ETH_GET_BLOCK_BY_NUMBER_RESPONSE,
+                  },
+                  {
+                    request: {
+                      params: ['0x2', false],
+                    },
+                    response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                  },
+                ],
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
+
+              // Force the block tracker to request a new block to clear the
+              // block cache
+              clock.runAll();
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe('unknown');
+            },
+          );
+        });
+
+        it('clears the ID of the network from state', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                latestBlock: BLOCK,
+                net_version: {
+                  response: {
+                    result: '42',
+                  },
+                },
+                eth_getBlockByNumber: [
+                  {
+                    response: {
+                      result: BLOCK,
+                    },
+                  },
+                  {
+                    response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                  },
+                ],
+                eth_blockNumber: {
+                  times: 2,
+                },
+              });
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkId'],
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              expect(controller.store.getState().networkId).toBe('42');
+
+              // Advance block tracker loop to force a fresh call to
+              // eth_getBlockByNumber
+              clock.runAll();
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkId'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+              expect(controller.store.getState().networkId).toBeNull();
+            },
+          );
+        });
+
+        it('clears whether the network supports EIP-1559 from state', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+                networkDetails: {
+                  EIPS: {
+                    1559: true,
+                  },
+                  other: 'details',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkDetails'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+              expect(controller.store.getState().networkDetails).toStrictEqual({
+                EIPS: {
+                  1559: undefined,
+                },
+              });
+            },
+          );
+        });
+
+        it('does not emit infuraIsBlocked', async () => {
+          const messenger = buildMessenger();
+
+          await withController(
+            {
+              messenger,
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              const promiseForNoInfuraIsBlockedEvents = waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsBlocked',
+                count: 0,
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(await promiseForNoInfuraIsBlockedEvents).toBeTruthy();
+            },
+          );
+        });
+
+        it('emits infuraIsUnblocked', async () => {
+          const messenger = buildMessenger();
+
+          await withController(
+            {
+              messenger,
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network }) => {
+              network.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              const infuraIsUnblocked = await waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsUnblocked',
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(infuraIsUnblocked).toBeTruthy();
+            },
+          );
+        });
       });
 
       describe('if the network was switched after the net_version request started but before it completed', () => {
-        it('persists to state the network version of the newly switched network, not the initial network', async () => {
+        it('stores the network status of the second network, not the first', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                },
+              },
+            },
+            async ({ controller, network: network1 }) => {
+              network1.mockEssentialRpcCalls({
+                net_version: [
+                  {
+                    response: SUCCESSFUL_NET_VERSION_RESPONSE,
+                  },
+                  {
+                    response: SUCCESSFUL_NET_VERSION_RESPONSE,
+                    beforeCompleting: async () => {
+                      await waitForStateChanges({
+                        controller,
+                        propertyPath: ['networkStatus'],
+                        operation: () => {
+                          controller.setProviderType('goerli');
+                        },
+                      });
+                    },
+                  },
+                ],
+                // Ensure that each call to eth_blockNumber returns a different
+                // block number, otherwise the first eth_getBlockByNumber
+                // response will get cached under the first block number
+                eth_blockNumber: [
+                  {
+                    response: {
+                      result: '0x1',
+                    },
+                  },
+                  {
+                    response: {
+                      result: '0x2',
+                    },
+                  },
+                ],
+                eth_getBlockByNumber: [
+                  {
+                    request: {
+                      params: ['0x1', false],
+                    },
+                    response: {
+                      result: {
+                        ...BLOCK,
+                        number: '0x1',
+                      },
+                    },
+                  },
+                  {
+                    request: {
+                      params: ['0x2', false],
+                    },
+                    response: {
+                      result: {
+                        ...BLOCK,
+                        number: '0x2',
+                      },
+                    },
+                  },
+                ],
+              });
+              const network2 = new NetworkCommunications({
+                networkClientType: 'infura',
+                networkClientOptions: {
+                  infuraNetwork: 'goerli',
+                },
+              });
+              network2.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                },
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
+
+              // Force the block tracker to request a new block to clear the
+              // block cache
+              clock.runAll();
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe('unknown');
+            },
+          );
+        });
+
+        it('stores the ID of the second network, not the first', async () => {
           await withController(
             {
               state: {
@@ -2373,24 +3413,6 @@ describe('NetworkController', () => {
                   rpcUrl: 'https://mock-rpc-url-2',
                   chainId: '0x1337',
                   ticker: 'RPC',
-                  id: 'testNetworkConfigurationId2',
-                },
-                networkDetails: {
-                  EIPS: {},
-                },
-                networkConfigurations: {
-                  testNetworkConfigurationId1: {
-                    rpcUrl: 'https://mock-rpc-url-1',
-                    chainId: '0xtest',
-                    ticker: 'TEST',
-                    id: 'testNetworkConfigurationId1',
-                  },
-                  testNetworkConfigurationId2: {
-                    rpcUrl: 'https://mock-rpc-url-2',
-                    chainId: '0x1337',
-                    ticker: 'RPC',
-                    id: 'testNetworkConfigurationId2',
-                  },
                 },
               },
             },
@@ -2403,28 +3425,21 @@ describe('NetworkController', () => {
                   beforeCompleting: async () => {
                     await waitForStateChanges({
                       controller,
-                      propertyPath: ['network'],
+                      propertyPath: ['networkStatus'],
                       operation: () => {
-                        controller.setActiveNetwork(
-                          'testNetworkConfigurationId1',
-                        );
+                        controller.setProviderType('goerli');
                       },
                     });
                   },
                 },
               });
-              const network2 = network1.with({
+              const network2 = new NetworkCommunications({
+                networkClientType: 'infura',
                 networkClientOptions: {
-                  customRpcUrl: 'https://mock-rpc-url-1',
-                },
-              });
-              network2.mockEssentialRpcCalls({
-                net_version: {
-                  response: {
-                    result: '222',
-                  },
+                  infuraNetwork: 'goerli',
                 },
               });
+              network2.mockEssentialRpcCalls();
 
               await withoutCallingLookupNetwork({
                 controller,
@@ -2435,19 +3450,261 @@ describe('NetworkController', () => {
 
               await waitForStateChanges({
                 controller,
-                propertyPath: ['network'],
+                propertyPath: ['networkId'],
                 operation: async () => {
                   await controller.lookupNetwork();
                 },
               });
 
-              expect(controller.store.getState().network).toBe('222');
+              expect(controller.store.getState().networkId).toBe('5');
             },
           );
         });
 
-        it('persists to state the EIP-1559 support for the newly switched network, not the initial one', async () => {
-          const nonEip1559RpcUrl = 'https://mock-rpc-url-1';
+        it('stores the EIP-1559 support of the second network, not the first', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                  ticker: 'RPC',
+                },
+                networkDetails: {
+                  EIPS: {},
+                  other: 'details',
+                },
+              },
+            },
+            async ({ controller, network: network1 }) => {
+              network1.mockEssentialRpcCalls({
+                latestBlock: POST_1559_BLOCK,
+                net_version: {
+                  response: SUCCESSFUL_NET_VERSION_RESPONSE,
+                  beforeCompleting: async () => {
+                    await waitForStateChanges({
+                      controller,
+                      propertyPath: ['networkDetails'],
+                      operation: () => {
+                        controller.setProviderType('goerli');
+                      },
+                    });
+                  },
+                },
+              });
+              const network2 = new NetworkCommunications({
+                networkClientType: 'infura',
+                networkClientOptions: {
+                  infuraNetwork: 'goerli',
+                },
+              });
+              network2.mockEssentialRpcCalls({
+                latestBlock: PRE_1559_BLOCK,
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkDetails'],
+                // setProviderType clears networkDetails first, and then updates
+                // it to what we expect it to be
+                count: 2,
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(controller.store.getState().networkDetails).toStrictEqual({
+                EIPS: {
+                  1559: false,
+                },
+              });
+            },
+          );
+        });
+
+        it('emits infuraIsBlocked, not infuraIsUnblocked, if the second network is blocked, even if the first one is not', async () => {
+          const messenger = buildMessenger();
+
+          await withController(
+            {
+              messenger,
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                  ticker: 'RPC',
+                },
+              },
+            },
+            async ({ controller, network: network1 }) => {
+              network1.mockEssentialRpcCalls({
+                net_version: {
+                  beforeCompleting: async () => {
+                    await waitForStateChanges({
+                      controller,
+                      propertyPath: ['networkDetails'],
+                      operation: () => {
+                        controller.setProviderType('goerli');
+                      },
+                    });
+                  },
+                },
+              });
+              const network2 = new NetworkCommunications({
+                networkClientType: 'infura',
+                networkClientOptions: {
+                  infuraNetwork: 'goerli',
+                },
+              });
+              network2.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: BLOCKED_INFURA_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              const promiseForNoInfuraIsUnblockedEvents =
+                waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsUnblocked',
+                  count: 0,
+                });
+              const promiseForInfuraIsBlocked = waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsBlocked',
+              });
+
+              await controller.lookupNetwork();
+
+              expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
+              expect(await promiseForInfuraIsBlocked).toBeTruthy();
+            },
+          );
+        });
+      });
+
+      describe('if the network was switched after the eth_getBlockByNumber request started but before it completed', () => {
+        it('stores the network status of the second network, not the first', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url-1',
+                  chainId: '0x1337',
+                  ticker: 'RPC',
+                },
+                networkDetails: {
+                  EIPS: {},
+                },
+              },
+            },
+            async ({ controller, network: network1 }) => {
+              network1.mockEssentialRpcCalls({
+                net_version: {
+                  times: 2,
+                },
+                // Ensure that each call to eth_blockNumber returns a different
+                // block number, otherwise the first eth_getBlockByNumber
+                // response will get cached under the first block number
+                eth_blockNumber: [
+                  {
+                    response: {
+                      result: '0x1',
+                    },
+                  },
+                  {
+                    response: {
+                      result: '0x2',
+                    },
+                  },
+                ],
+                eth_getBlockByNumber: [
+                  {
+                    request: {
+                      params: ['0x1', false],
+                    },
+                    response: {
+                      result: {
+                        ...BLOCK,
+                        number: '0x1',
+                      },
+                    },
+                  },
+                  {
+                    request: {
+                      params: ['0x2', false],
+                    },
+                    response: {
+                      result: {
+                        ...BLOCK,
+                        number: '0x2',
+                      },
+                    },
+                    beforeCompleting: async () => {
+                      await waitForStateChanges({
+                        controller,
+                        propertyPath: ['networkStatus'],
+                        operation: () => {
+                          controller.setProviderType('goerli');
+                        },
+                      });
+                    },
+                  },
+                ],
+              });
+              const network2 = new NetworkCommunications({
+                networkClientType: 'infura',
+                networkClientOptions: {
+                  infuraNetwork: 'goerli',
+                },
+              });
+              network2.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+                },
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
+
+              // Force the block tracker to request a new block to clear the
+              // block cache
+              clock.runAll();
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe('unknown');
+            },
+          );
+        });
+
+        it('stores the network ID of the second network, not the first', async () => {
           await withController(
             {
               state: {
@@ -2456,78 +3713,184 @@ describe('NetworkController', () => {
                   rpcUrl: 'https://mock-rpc-url-2',
                   chainId: '0x1337',
                   ticker: 'RPC',
-                  id: 'testNetworkConfigurationId2',
-                },
-                networkDetails: {
-                  EIPS: {},
-                },
-                networkConfigurations: {
-                  testNetworkConfigurationId1: {
-                    rpcUrl: nonEip1559RpcUrl,
-                    chainId: '0xtest',
-                    ticker: 'TEST',
-                    id: 'testNetworkConfigurationId1',
-                  },
-                  testNetworkConfigurationId2: {
-                    rpcUrl: 'https://mock-rpc-url-2',
-                    chainId: '0x1337',
-                    ticker: 'RPC',
-                    id: 'testNetworkConfigurationId2',
-                  },
                 },
               },
             },
             async ({ controller, network: network1 }) => {
               network1.mockEssentialRpcCalls({
-                net_version: {
-                  response: {
-                    result: '111',
-                  },
+                eth_getBlockByNumber: {
                   beforeCompleting: async () => {
                     await waitForStateChanges({
                       controller,
-                      propertyPath: ['networkDetails'],
+                      propertyPath: ['networkStatus'],
                       operation: () => {
-                        controller.setActiveNetwork(
-                          'testNetworkConfigurationId1',
-                        );
+                        controller.setProviderType('goerli');
                       },
                     });
                   },
                 },
-                eth_getBlockByNumber: {
-                  response: {
-                    result: POST_1559_BLOCK,
-                  },
-                },
-              });
-              const network2 = network1.with({
-                networkClientOptions: {
-                  customRpcUrl: nonEip1559RpcUrl,
-                },
-              });
-              network2.mockEssentialRpcCalls({
                 net_version: {
                   response: {
-                    result: '222',
-                  },
-                },
-                eth_getBlockByNumber: {
-                  response: {
-                    result: PRE_1559_BLOCK,
+                    result: '111',
                   },
                 },
               });
-              await waitForLookupNetworkToComplete({
+              const network2 = new NetworkCommunications({
+                networkClientType: 'infura',
+                networkClientOptions: {
+                  infuraNetwork: 'goerli',
+                },
+              });
+              network2.mockEssentialRpcCalls();
+
+              await withoutCallingLookupNetwork({
                 controller,
                 operation: async () => {
                   await controller.initializeProvider();
                 },
               });
 
-              expect(
-                controller.store.getState().networkDetails.EIPS['1559'],
-              ).toBe(false);
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkId'],
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(controller.store.getState().networkId).toBe('5');
+            },
+          );
+        });
+
+        it('stores the EIP-1559 support of the second network, not the first', async () => {
+          await withController(
+            {
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                  ticker: 'RPC',
+                },
+                networkDetails: {
+                  EIPS: {},
+                  other: 'details',
+                },
+              },
+            },
+            async ({ controller, network: network1 }) => {
+              network1.mockEssentialRpcCalls({
+                latestBlock: POST_1559_BLOCK,
+                eth_getBlockByNumber: {
+                  beforeCompleting: async () => {
+                    await waitForStateChanges({
+                      controller,
+                      propertyPath: ['networkDetails'],
+                      operation: () => {
+                        controller.setProviderType('goerli');
+                      },
+                    });
+                  },
+                },
+              });
+              const network2 = new NetworkCommunications({
+                networkClientType: 'infura',
+                networkClientOptions: {
+                  infuraNetwork: 'goerli',
+                },
+              });
+              network2.mockEssentialRpcCalls({
+                latestBlock: PRE_1559_BLOCK,
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkDetails'],
+                // setProviderType clears networkDetails first, and then updates
+                // it to what we expect it to be
+                count: 2,
+                operation: async () => {
+                  await controller.lookupNetwork();
+                },
+              });
+
+              expect(controller.store.getState().networkDetails).toStrictEqual({
+                EIPS: {
+                  1559: false,
+                },
+              });
+            },
+          );
+        });
+
+        it('emits infuraIsBlocked, not infuraIsUnblocked, if the second network is blocked, even if the first one is not', async () => {
+          const messenger = buildMessenger();
+
+          await withController(
+            {
+              messenger,
+              state: {
+                provider: {
+                  type: 'rpc',
+                  rpcUrl: 'https://mock-rpc-url',
+                  chainId: '0x1337',
+                  ticker: 'RPC',
+                },
+              },
+            },
+            async ({ controller, network: network1 }) => {
+              network1.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  beforeCompleting: async () => {
+                    await waitForStateChanges({
+                      controller,
+                      propertyPath: ['networkDetails'],
+                      operation: () => {
+                        controller.setProviderType('goerli');
+                      },
+                    });
+                  },
+                },
+              });
+              const network2 = new NetworkCommunications({
+                networkClientType: 'infura',
+                networkClientOptions: {
+                  infuraNetwork: 'goerli',
+                },
+              });
+              network2.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: BLOCKED_INFURA_RESPONSE,
+                },
+              });
+              await withoutCallingLookupNetwork({
+                controller,
+                operation: async () => {
+                  await controller.initializeProvider();
+                },
+              });
+              const promiseForNoInfuraIsUnblockedEvents =
+                waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsUnblocked',
+                  count: 0,
+                });
+              const promiseForInfuraIsBlocked = waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsBlocked',
+              });
+
+              await controller.lookupNetwork();
+
+              expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
+              expect(await promiseForInfuraIsBlocked).toBeTruthy();
             },
           );
         });
@@ -2564,28 +3927,21 @@ describe('NetworkController', () => {
       );
     });
 
-    it('captures the current provider configuration before overwriting it', async () => {
+    it('stores the current provider configuration before overwriting it', async () => {
       await withController(
         {
           state: {
             provider: {
               type: 'rpc',
-              rpcUrl: 'https://mock-rpc-url-2',
-              chainId: '0x9999',
-              ticker: 'RPC',
-              id: 'testNetworkConfigurationId2',
+              rpcUrl: 'https://mock-rpc-url-1',
+              chainId: '0x111',
+              ticker: 'TEST',
+              id: 'testNetworkConfigurationId1',
             },
             networkConfigurations: {
-              testNetworkConfigurationId1: {
-                rpcUrl: 'https://mock-rpc-url-1',
-                chainId: '0xtest',
-                ticker: 'TEST',
-                id: 'testNetworkConfigurationId1',
-              },
               testNetworkConfigurationId2: {
                 rpcUrl: 'https://mock-rpc-url-2',
-                chainId: '0x9999',
-                ticker: 'RPC',
+                chainId: '0x222',
                 id: 'testNetworkConfigurationId2',
               },
             },
@@ -2600,16 +3956,16 @@ describe('NetworkController', () => {
           });
           network.mockEssentialRpcCalls();
 
-          controller.setActiveNetwork('testNetworkConfigurationId1');
+          controller.setActiveNetwork('testNetworkConfigurationId2');
 
           expect(
             controller.store.getState().previousProviderStore,
           ).toStrictEqual({
             type: 'rpc',
-            rpcUrl: 'https://mock-rpc-url-2',
-            chainId: '0x9999',
-            ticker: 'RPC',
-            id: 'testNetworkConfigurationId2',
+            rpcUrl: 'https://mock-rpc-url-1',
+            chainId: '0x111',
+            ticker: 'TEST',
+            id: 'testNetworkConfigurationId1',
           });
         },
       );
@@ -2666,7 +4022,7 @@ describe('NetworkController', () => {
       );
     });
 
-    it('emits networkWillChange before making any changes to the network store', async () => {
+    it('emits networkWillChange before making any changes to the network status', async () => {
       const messenger = buildMessenger();
 
       await withController(
@@ -2675,22 +4031,21 @@ describe('NetworkController', () => {
           state: {
             provider: {
               type: 'rpc',
-              rpcUrl: 'http://example-custom-rpc.metamask.io',
-              chainId: '0xtest2',
+              rpcUrl: 'https://mock-rpc-url-1',
+              chainId: '0x111',
               ticker: 'TEST2',
-              id: 'testNetworkConfigurationId2',
+              id: 'testNetworkConfigurationId1',
             },
             networkConfigurations: {
               testNetworkConfigurationId1: {
-                rpcUrl: 'https://mock-rpc-url',
-                chainId: '0xtest',
-                ticker: 'TEST',
-
+                rpcUrl: 'https://mock-rpc-url-1',
+                chainId: '0x111',
+                ticker: 'TEST1',
                 id: 'testNetworkConfigurationId1',
               },
               testNetworkConfigurationId2: {
-                rpcUrl: 'http://example-custom-rpc.metamask.io',
-                chainId: '0xtest2',
+                rpcUrl: 'https://mock-rpc-url-2',
+                chainId: '0x222',
                 ticker: 'TEST2',
                 id: 'testNetworkConfigurationId2',
               },
@@ -2700,22 +4055,16 @@ describe('NetworkController', () => {
         async ({ controller, network: network1 }) => {
           network1.mockEssentialRpcCalls({
             net_version: {
-              response: {
-                result: '42',
-              },
+              response: SUCCESSFUL_NET_VERSION_RESPONSE,
             },
           });
           const network2 = network1.with({
             networkClientOptions: {
-              customRpcUrl: 'https://mock-rpc-url',
+              customRpcUrl: 'https://mock-rpc-url-2',
             },
           });
           network2.mockEssentialRpcCalls({
-            net_version: {
-              response: {
-                result: '99',
-              },
-            },
+            net_version: UNSUCCESSFUL_JSON_RPC_RESPONSE,
           });
           await waitForLookupNetworkToComplete({
             controller,
@@ -2723,8 +4072,9 @@ describe('NetworkController', () => {
               await controller.initializeProvider();
             },
           });
-          const initialNetwork = controller.store.getState().network;
-          expect(initialNetwork).toBe('42');
+          const initialNetworkStatus =
+            controller.store.getState().networkStatus;
+          expect(initialNetworkStatus).toBe('available');
 
           const networkWillChange = await waitForPublishedEvents({
             messenger,
@@ -2733,7 +4083,9 @@ describe('NetworkController', () => {
               controller.setActiveNetwork('testNetworkConfigurationId2');
             },
             beforeResolving: () => {
-              expect(controller.store.getState().network).toBe(initialNetwork);
+              expect(controller.store.getState().networkStatus).toBe(
+                initialNetworkStatus,
+              );
             },
           });
           expect(networkWillChange).toBeTruthy();
@@ -2741,7 +4093,7 @@ describe('NetworkController', () => {
       );
     });
 
-    it('resets the network state to "loading" before emitting networkDidChange', async () => {
+    it('resets the network status to "unknown" before emitting networkDidChange', async () => {
       await withController(
         {
           state: {
@@ -2750,7 +4102,7 @@ describe('NetworkController', () => {
               rpcUrl: 'http://mock-rpc-url-2',
               chainId: '0xtest2',
               ticker: 'TEST2',
-              id: 'testNetworkConfigurationId2',
+              id: 'testNetworkConfigurationId1',
             },
             networkConfigurations: {
               testNetworkConfigurationId1: {
@@ -2771,18 +4123,27 @@ describe('NetworkController', () => {
         async ({ controller, network: network1 }) => {
           network1.mockEssentialRpcCalls({
             net_version: {
-              response: {
-                result: '255',
-              },
+              response: SUCCESSFUL_NET_VERSION_RESPONSE,
+            },
+          });
+          const network2 = network1.with({
+            networkClientType: 'custom',
+            networkClientOptions: {
+              customRpcUrl: 'https://mock-rpc-url-1',
+            },
+          });
+          network2.mockEssentialRpcCalls({
+            net_version: {
+              response: SUCCESSFUL_NET_VERSION_RESPONSE,
             },
           });
 
           await controller.initializeProvider();
-          expect(controller.store.getState().network).toBe('255');
+          expect(controller.store.getState().networkStatus).toBe('available');
 
           await waitForStateChanges({
             controller,
-            propertyPath: ['network'],
+            propertyPath: ['networkStatus'],
             // We only care about the first state change, because it happens
             // before networkDidChange
             count: 1,
@@ -2790,32 +4151,32 @@ describe('NetworkController', () => {
               controller.setActiveNetwork('testNetworkConfigurationId1');
             },
           });
-          expect(controller.store.getState().network).toBe('loading');
+          expect(controller.store.getState().networkStatus).toBe('unknown');
         },
       );
     });
 
-    it('resets EIP support for the network before emitting networkDidChange', async () => {
+    it('clears EIP-1559 support for the network from state before emitting networkDidChange', async () => {
       await withController(
         {
           state: {
             provider: {
               type: 'rpc',
-              rpcUrl: 'http://mock-rpc-url-2',
-              chainId: '0xtest2',
-              ticker: 'TEST2',
-              id: 'testNetworkConfigurationId2',
+              rpcUrl: 'https://mock-rpc-url-1',
+              chainId: '0x111',
+              ticker: 'TEST1',
+              id: 'testNetworkConfigurationId1',
             },
             networkConfigurations: {
               testNetworkConfigurationId1: {
                 rpcUrl: 'https://mock-rpc-url-1',
-                chainId: '0xtest',
-                ticker: 'TEST',
+                chainId: '0x1111',
+                ticker: 'TEST1',
                 id: 'testNetworkConfigurationId1',
               },
               testNetworkConfigurationId2: {
-                rpcUrl: 'http://mock-rpc-url-2',
-                chainId: '0xtest2',
+                rpcUrl: 'https://mock-rpc-url-2',
+                chainId: '0x222',
                 ticker: 'TEST2',
                 id: 'testNetworkConfigurationId2',
               },
@@ -2850,7 +4211,7 @@ describe('NetworkController', () => {
             // before networkDidChange
             count: 1,
             operation: () => {
-              controller.setActiveNetwork('testNetworkConfigurationId1');
+              controller.setActiveNetwork('testNetworkConfigurationId2');
             },
           });
           expect(controller.store.getState().networkDetails).toStrictEqual({
@@ -2923,20 +4284,21 @@ describe('NetworkController', () => {
               testNetworkConfigurationId: {
                 id: 'testNetworkConfigurationId',
                 rpcUrl: 'https://mock-rpc-url',
-                chainId: '0xtest',
+                chainId: '0x1337',
                 ticker: 'TEST',
               },
             },
           },
         },
-        async ({ controller }) => {
-          const network = new NetworkCommunications({
+        async ({ controller, network: network1 }) => {
+          network1.mockEssentialRpcCalls();
+          const network2 = network1.with({
             networkClientType: 'custom',
             networkClientOptions: {
               customRpcUrl: 'https://mock-rpc-url',
             },
           });
-          network.mockEssentialRpcCalls();
+          network2.mockEssentialRpcCalls();
           await controller.initializeProvider();
 
           const { provider: providerBefore } =
@@ -3028,7 +4390,7 @@ describe('NetworkController', () => {
       );
     });
 
-    it('persists the network version to state (assuming that the request for net_version responds successfully)', async () => {
+    it('determines the status of the network, storing it in state', async () => {
       await withController(
         {
           state: {
@@ -3051,31 +4413,29 @@ describe('NetworkController', () => {
           });
           network.mockEssentialRpcCalls({
             net_version: {
-              response: {
-                result: '42',
-              },
+              response: SUCCESSFUL_NET_VERSION_RESPONSE,
             },
           });
-
           await waitForStateChanges({
             controller,
-            propertyPath: ['network'],
+            propertyPath: ['networkStatus'],
             operation: () => {
               controller.setActiveNetwork('testNetworkConfigurationId');
             },
           });
 
-          expect(controller.store.getState().network).toBe('42');
+          expect(controller.store.getState().networkStatus).toBe('available');
         },
       );
     });
 
-    it('persists to state whether the network supports EIP-1559 (assuming that the request for eth_getBlockByNumber responds successfully)', async () => {
+    it('determines whether the network supports EIP-1559, storing it in state', async () => {
       await withController(
         {
           state: {
             networkDetails: {
               EIPS: {},
+              other: 'details',
             },
             networkConfigurations: {
               testNetworkConfigurationId: {
@@ -3101,30 +4461,28 @@ describe('NetworkController', () => {
           await waitForStateChanges({
             controller,
             propertyPath: ['networkDetails'],
+            // setActiveNetwork clears networkDetails first, and then updates it
+            // to what we expect it to be
             count: 2,
             operation: () => {
               controller.setActiveNetwork('testNetworkConfigurationId');
             },
           });
 
-          expect(controller.store.getState().networkDetails.EIPS['1559']).toBe(
-            true,
-          );
+          expect(controller.store.getState().networkDetails).toStrictEqual({
+            EIPS: {
+              1559: true,
+            },
+          });
         },
       );
     });
   });
 
   describe('setProviderType', () => {
-    for (const {
-      nickname,
-      networkType,
-      chainId,
-      networkVersion,
-      ticker,
-    } of INFURA_NETWORKS) {
+    for (const { networkType, chainId, ticker } of INFURA_NETWORKS) {
       describe(`given a type of "${networkType}"`, () => {
-        it('captures the current provider configuration before overwriting it', async () => {
+        it('stores the current provider configuration before overwriting it', async () => {
           await withController(
             {
               state: {
@@ -3277,7 +4635,7 @@ describe('NetworkController', () => {
           });
         });
 
-        it('resets the network state to "loading" before emitting networkDidChange', async () => {
+        it('resets the network status to "unknown" before emitting networkDidChange', async () => {
           await withController(
             {
               state: {
@@ -3301,9 +4659,7 @@ describe('NetworkController', () => {
             async ({ controller, network: network1 }) => {
               network1.mockEssentialRpcCalls({
                 net_version: {
-                  response: {
-                    result: '255',
-                  },
+                  response: SUCCESSFUL_NET_VERSION_RESPONSE,
                 },
               });
               const network2 = network1.with({
@@ -3315,11 +4671,13 @@ describe('NetworkController', () => {
               network2.mockEssentialRpcCalls();
 
               await controller.initializeProvider();
-              expect(controller.store.getState().network).toBe('255');
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
 
               await waitForStateChanges({
                 controller,
-                propertyPath: ['network'],
+                propertyPath: ['networkStatus'],
                 // We only care about the first state change, because it
                 // happens before networkDidChange
                 count: 1,
@@ -3327,12 +4685,12 @@ describe('NetworkController', () => {
                   controller.setProviderType(networkType);
                 },
               });
-              expect(controller.store.getState().network).toBe('loading');
+              expect(controller.store.getState().networkStatus).toBe('unknown');
             },
           );
         });
 
-        it('resets EIP support for the network before emitting networkDidChange', async () => {
+        it('clears EIP-1559 support for the network from state before emitting networkDidChange', async () => {
           await withController(
             {
               state: {
@@ -3393,7 +4751,7 @@ describe('NetworkController', () => {
           );
         });
 
-        it(`initializes a provider pointed to the ${nickname} Infura network (chainId: ${chainId})`, async () => {
+        it(`initializes a provider pointed to the "${networkType}" Infura network (chainId: ${chainId})`, async () => {
           await withController(async ({ controller }) => {
             const network = new NetworkCommunications({
               networkClientType: 'infura',
@@ -3417,14 +4775,15 @@ describe('NetworkController', () => {
         });
 
         it('replaces the provider object underlying the provider proxy without creating a new instance of the proxy itself', async () => {
-          await withController(async ({ controller }) => {
-            const network = new NetworkCommunications({
+          await withController(async ({ controller, network: network1 }) => {
+            network1.mockEssentialRpcCalls();
+            const network2 = network1.with({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: networkType,
               },
             });
-            network.mockEssentialRpcCalls();
+            network2.mockEssentialRpcCalls();
             await controller.initializeProvider();
 
             const { provider: providerBefore } =
@@ -3461,7 +4820,7 @@ describe('NetworkController', () => {
           });
         });
 
-        it('emits infuraIsUnblocked (assuming that the request for eth_blockNumber responds successfully)', async () => {
+        it('emits infuraIsBlocked or infuraIsUnblocked, depending on whether Infura is blocking requests', async () => {
           const messenger = buildMessenger();
 
           await withController({ messenger }, async ({ controller }) => {
@@ -3471,21 +4830,29 @@ describe('NetworkController', () => {
                 infuraNetwork: networkType,
               },
             });
-            network.mockEssentialRpcCalls();
-
-            const infuraIsUnblocked = await waitForPublishedEvents({
-              messenger,
-              eventType: 'NetworkController:infuraIsUnblocked',
-              operation: async () => {
-                controller.setProviderType(networkType);
+            network.mockEssentialRpcCalls({
+              eth_getBlockByNumber: {
+                response: BLOCKED_INFURA_RESPONSE,
               },
             });
+            const promiseForNoInfuraIsUnblockedEvents = waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:infuraIsUnblocked',
+              count: 0,
+            });
+            const promiseForInfuraIsBlocked = waitForPublishedEvents({
+              messenger,
+              eventType: 'NetworkController:infuraIsBlocked',
+            });
 
-            expect(infuraIsUnblocked).toBeTruthy();
+            controller.setProviderType(networkType);
+
+            expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
+            expect(await promiseForInfuraIsBlocked).toBeTruthy();
           });
         });
 
-        it(`persists "${networkVersion}" to state as the network version of ${nickname}`, async () => {
+        it('determines the status of the network, storing it in state', async () => {
           await withController(async ({ controller }) => {
             const network = new NetworkCommunications({
               networkClientType: 'infura',
@@ -3493,26 +4860,31 @@ describe('NetworkController', () => {
                 infuraNetwork: networkType,
               },
             });
-            network.mockEssentialRpcCalls();
+            network.mockEssentialRpcCalls({
+              // This results in a successful call to eth_getBlockByNumber
+              // implicitly
+              latestBlock: BLOCK,
+            });
 
             await waitForStateChanges({
               controller,
-              propertyPath: ['network'],
+              propertyPath: ['networkStatus'],
               operation: () => {
                 controller.setProviderType(networkType);
               },
             });
 
-            expect(controller.store.getState().network).toBe(networkVersion);
+            expect(controller.store.getState().networkStatus).toBe('available');
           });
         });
 
-        it('persists to state whether the network supports EIP-1559 (assuming that the request for eth_getBlockByNumber responds successfully)', async () => {
+        it('determines whether the network supports EIP-1559, storing it in state', async () => {
           await withController(
             {
               state: {
                 networkDetails: {
                   EIPS: {},
+                  other: 'details',
                 },
               },
             },
@@ -3530,15 +4902,19 @@ describe('NetworkController', () => {
               await waitForStateChanges({
                 controller,
                 propertyPath: ['networkDetails'],
+                // setProviderType clears networkDetails first, and then updates
+                // it to what we expect it to be
                 count: 2,
                 operation: () => {
                   controller.setProviderType(networkType);
                 },
               });
 
-              expect(
-                controller.store.getState().networkDetails.EIPS['1559'],
-              ).toBe(true);
+              expect(controller.store.getState().networkDetails).toStrictEqual({
+                EIPS: {
+                  1559: true,
+                },
+              });
             },
           );
         });
@@ -3569,12 +4945,7 @@ describe('NetworkController', () => {
   });
 
   describe('resetConnection', () => {
-    for (const {
-      nickname,
-      networkType,
-      chainId,
-      networkVersion,
-    } of INFURA_NETWORKS) {
+    for (const { networkType, chainId } of INFURA_NETWORKS) {
       describe(`when the type in the provider configuration is "${networkType}"`, () => {
         it('emits networkWillChange', async () => {
           const messenger = buildMessenger();
@@ -3607,7 +4978,7 @@ describe('NetworkController', () => {
           );
         });
 
-        it('resets the network state to "loading" before emitting networkDidChange', async () => {
+        it('resets the network status to "unknown" before emitting networkDidChange', async () => {
           await withController(
             {
               state: {
@@ -3627,11 +4998,13 @@ describe('NetworkController', () => {
               });
 
               await controller.initializeProvider();
-              expect(controller.store.getState().network).toBe(networkVersion);
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
 
               await waitForStateChanges({
                 controller,
-                propertyPath: ['network'],
+                propertyPath: ['networkStatus'],
                 // We only care about the first state change, because it
                 // happens before networkDidChange
                 count: 1,
@@ -3639,12 +5012,12 @@ describe('NetworkController', () => {
                   controller.resetConnection();
                 },
               });
-              expect(controller.store.getState().network).toBe('loading');
+              expect(controller.store.getState().networkStatus).toBe('unknown');
             },
           );
         });
 
-        it('resets EIP support for the network before emitting networkDidChange', async () => {
+        it('clears EIP-1559 support for the network from state before emitting networkDidChange', async () => {
           await withController(
             {
               state: {
@@ -3690,7 +5063,7 @@ describe('NetworkController', () => {
           );
         });
 
-        it(`initializes a new provider object pointed to the current Infura network (name: ${nickname}, chain ID: ${chainId})`, async () => {
+        it(`initializes a new provider object pointed to the current Infura network (type: "${networkType}", chain ID: ${chainId})`, async () => {
           await withController(
             {
               state: {
@@ -3732,7 +5105,11 @@ describe('NetworkController', () => {
               },
             },
             async ({ controller, network }) => {
-              network.mockEssentialRpcCalls();
+              network.mockEssentialRpcCalls({
+                eth_blockNumber: {
+                  times: 2,
+                },
+              });
               await controller.initializeProvider();
 
               const { provider: providerBefore } =
@@ -3777,7 +5154,7 @@ describe('NetworkController', () => {
           );
         });
 
-        it('emits infuraIsUnblocked (assuming that the request for eth_blockNumber responds successfully)', async () => {
+        it('emits infuraIsBlocked or infuraIsUnblocked, depending on whether Infura is blocking requests', async () => {
           const messenger = buildMessenger();
 
           await withController(
@@ -3793,22 +5170,31 @@ describe('NetworkController', () => {
               },
             },
             async ({ controller, network }) => {
-              network.mockEssentialRpcCalls();
-
-              const infuraIsUnblocked = await waitForPublishedEvents({
-                messenger,
-                eventType: 'NetworkController:infuraIsUnblocked',
-                operation: () => {
-                  controller.resetConnection();
+              network.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: BLOCKED_INFURA_RESPONSE,
                 },
               });
+              const promiseForNoInfuraIsUnblockedEvents =
+                waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsUnblocked',
+                  count: 0,
+                });
+              const promiseForInfuraIsBlocked = waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsBlocked',
+              });
 
-              expect(infuraIsUnblocked).toBeTruthy();
+              controller.resetConnection();
+
+              expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
+              expect(await promiseForInfuraIsBlocked).toBeTruthy();
             },
           );
         });
 
-        it(`ensures that the network version in state is set to "${networkVersion}"`, async () => {
+        it('checks the status of the network again, updating state appropriately', async () => {
           await withController(
             {
               state: {
@@ -3825,18 +5211,20 @@ describe('NetworkController', () => {
 
               await waitForStateChanges({
                 controller,
-                propertyPath: ['network'],
+                propertyPath: ['networkStatus'],
                 operation: () => {
                   controller.resetConnection();
                 },
               });
 
-              expect(controller.store.getState().network).toBe(networkVersion);
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
             },
           );
         });
 
-        it('does not ensure that EIP-1559 support for the current network is up to date', async () => {
+        it('checks whether the network supports EIP-1559 again, updating state appropriately', async () => {
           await withController(
             {
               state: {
@@ -3853,15 +5241,25 @@ describe('NetworkController', () => {
                 latestBlock: POST_1559_BLOCK,
               });
 
-              expect(
-                controller.store.getState().networkDetails.EIPS['1559'],
-              ).toBeUndefined();
+              expect(controller.store.getState().networkDetails).toStrictEqual({
+                EIPS: {
+                  1559: undefined,
+                },
+              });
 
-              controller.resetConnection();
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkDetails'],
+                operation: () => {
+                  controller.resetConnection();
+                },
+              });
 
-              expect(
-                controller.store.getState().networkDetails.EIPS['1559'],
-              ).toBeUndefined();
+              expect(controller.store.getState().networkDetails).toStrictEqual({
+                EIPS: {
+                  1559: true,
+                },
+              });
             },
           );
         });
@@ -3909,7 +5307,7 @@ describe('NetworkController', () => {
         );
       });
 
-      it('resets the network state to "loading" before emitting networkDidChange', async () => {
+      it('resets the network status to "unknown" before emitting networkDidChange', async () => {
         await withController(
           {
             state: {
@@ -3932,22 +5330,21 @@ describe('NetworkController', () => {
           },
           async ({ controller, network }) => {
             network.mockEssentialRpcCalls({
-              eth_blockNumber: {
+              net_version: {
+                response: SUCCESSFUL_NET_VERSION_RESPONSE,
                 times: 2,
               },
-              net_version: {
-                response: {
-                  result: '255',
-                },
+              eth_blockNumber: {
+                times: 2,
               },
             });
 
             await controller.initializeProvider();
-            expect(controller.store.getState().network).toBe('255');
 
+            expect(controller.store.getState().networkStatus).toBe('available');
             await waitForStateChanges({
               controller,
-              propertyPath: ['network'],
+              propertyPath: ['networkStatus'],
               // We only care about the first state change, because it happens
               // before networkDidChange
               count: 1,
@@ -3955,12 +5352,12 @@ describe('NetworkController', () => {
                 controller.resetConnection();
               },
             });
-            expect(controller.store.getState().network).toBe('loading');
+            expect(controller.store.getState().networkStatus).toBe('unknown');
           },
         );
       });
 
-      it('resets EIP support for the network before emitting networkDidChange', async () => {
+      it('clears EIP-1559 support for the network from state before emitting networkDidChange', async () => {
         await withController(
           {
             state: {
@@ -4075,7 +5472,11 @@ describe('NetworkController', () => {
             },
           },
           async ({ controller, network }) => {
-            network.mockEssentialRpcCalls();
+            network.mockEssentialRpcCalls({
+              eth_blockNumber: {
+                times: 2,
+              },
+            });
             await controller.initializeProvider();
 
             const { provider: providerBefore } =
@@ -4174,7 +5575,7 @@ describe('NetworkController', () => {
         );
       });
 
-      it('ensures that the network version in state is up to date', async () => {
+      it('checks the status of the network again, updating state appropriately', async () => {
         await withController(
           {
             state: {
@@ -4198,26 +5599,25 @@ describe('NetworkController', () => {
           async ({ controller, network }) => {
             network.mockEssentialRpcCalls({
               net_version: {
-                response: {
-                  result: '42',
-                },
+                response: SUCCESSFUL_NET_VERSION_RESPONSE,
               },
             });
+            expect(controller.store.getState().networkStatus).toBe('unknown');
 
             await waitForStateChanges({
               controller,
-              propertyPath: ['network'],
+              propertyPath: ['networkStatus'],
               operation: () => {
                 controller.resetConnection();
               },
             });
 
-            expect(controller.store.getState().network).toBe('42');
+            expect(controller.store.getState().networkStatus).toBe('available');
           },
         );
       });
 
-      it('does not ensure that EIP-1559 support for the current network is up to date', async () => {
+      it('ensures that EIP-1559 support for the current network is up to date', async () => {
         await withController(
           {
             state: {
@@ -4243,15 +5643,25 @@ describe('NetworkController', () => {
               latestBlock: POST_1559_BLOCK,
             });
 
-            expect(
-              controller.store.getState().networkDetails.EIPS['1559'],
-            ).toBeUndefined();
+            expect(controller.store.getState().networkDetails).toStrictEqual({
+              EIPS: {
+                1559: undefined,
+              },
+            });
 
-            controller.resetConnection();
+            await waitForStateChanges({
+              controller,
+              propertyPath: ['networkDetails'],
+              operation: () => {
+                controller.resetConnection();
+              },
+            });
 
-            expect(
-              controller.store.getState().networkDetails.EIPS['1559'],
-            ).toBeUndefined();
+            expect(controller.store.getState().networkDetails).toStrictEqual({
+              EIPS: {
+                1559: true,
+              },
+            });
           },
         );
       });
@@ -4259,12 +5669,7 @@ describe('NetworkController', () => {
   });
 
   describe('rollbackToPreviousProvider', () => {
-    for (const {
-      nickname,
-      networkType,
-      chainId,
-      networkVersion,
-    } of INFURA_NETWORKS) {
+    for (const { networkType, chainId } of INFURA_NETWORKS) {
       describe(`if the previous provider configuration had a type of "${networkType}"`, () => {
         it('overwrites the the current provider configuration with the previous provider configuration', async () => {
           await withController(
@@ -4272,68 +5677,65 @@ describe('NetworkController', () => {
               state: {
                 provider: {
                   type: networkType,
-                  rpcUrl: '',
-                  chainId: BUILT_IN_NETWORKS[networkType].chainId,
-                  nickname: '',
-                  ticker: BUILT_IN_NETWORKS[networkType].ticker,
+                  rpcUrl: 'https://mock-rpc-url-1',
+                  chainId: '0x111',
+                  nickname: 'network 1',
+                  ticker: 'TEST1',
                   rpcPrefs: {
-                    blockExplorerUrl:
-                      BUILT_IN_NETWORKS[networkType].blockExplorerUrl,
+                    blockExplorerUrl: 'https://test-block-explorer-1.com',
                   },
+                  id: 'testNetworkConfigurationId1',
                 },
                 networkConfigurations: {
                   testNetworkConfigurationId1: {
                     rpcUrl: 'https://mock-rpc-url-1',
-                    chainId: '0xtest',
-                    nickname: 'test-chain',
-                    ticker: 'TEST',
+                    chainId: '0x111',
+                    nickname: 'network 1',
+                    ticker: 'TEST1',
                     rpcPrefs: {
-                      blockExplorerUrl: 'test-block-explorer.com',
+                      blockExplorerUrl: 'https://test-block-explorer-1.com',
                     },
                     id: 'testNetworkConfigurationId1',
                   },
                   testNetworkConfigurationId2: {
-                    rpcUrl: 'http://mock-rpc-url-2',
-                    chainId: '0xtest2',
-                    nickname: 'test-chain-2',
+                    rpcUrl: 'https://mock-rpc-url-2',
+                    chainId: '0x222',
+                    nickname: 'network 2',
                     ticker: 'TEST2',
                     rpcPrefs: {
-                      blockExplorerUrl: 'test-block-explorer-2.com',
+                      blockExplorerUrl: 'https://test-block-explorer-2.com',
                     },
                     id: 'testNetworkConfigurationId2',
                   },
                 },
-                networkDetails: {
-                  EIPS: {},
-                },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls();
-              const network2 = network1.with({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
                 networkClientType: 'custom',
                 networkClientOptions: {
-                  customRpcUrl: 'https://mock-rpc-url',
+                  customRpcUrl: 'https://mock-rpc-url-2',
                 },
               });
-              network2.mockEssentialRpcCalls();
+              currentNetwork.mockEssentialRpcCalls();
+              previousNetwork.mockEssentialRpcCalls();
 
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: () => {
-                  controller.setActiveNetwork('testNetworkConfigurationId1');
+                  controller.setActiveNetwork('testNetworkConfigurationId2');
                 },
               });
               expect(controller.store.getState().provider).toStrictEqual({
-                rpcUrl: 'https://mock-rpc-url-1',
-                chainId: '0xtest',
-                nickname: 'test-chain',
-                ticker: 'TEST',
-                rpcPrefs: {
-                  blockExplorerUrl: 'test-block-explorer.com',
-                },
-                id: 'testNetworkConfigurationId1',
                 type: 'rpc',
+                rpcUrl: 'https://mock-rpc-url-2',
+                chainId: '0x222',
+                nickname: 'network 2',
+                ticker: 'TEST2',
+                rpcPrefs: {
+                  blockExplorerUrl: 'https://test-block-explorer-2.com',
+                },
+                id: 'testNetworkConfigurationId2',
               });
 
               await waitForLookupNetworkToComplete({
@@ -4344,14 +5746,14 @@ describe('NetworkController', () => {
               });
               expect(controller.store.getState().provider).toStrictEqual({
                 type: networkType,
-                rpcUrl: '',
-                chainId: BUILT_IN_NETWORKS[networkType].chainId,
-                ticker: BUILT_IN_NETWORKS[networkType].ticker,
-                nickname: '',
+                rpcUrl: 'https://mock-rpc-url-1',
+                chainId: '0x111',
+                nickname: 'network 1',
+                ticker: 'TEST1',
                 rpcPrefs: {
-                  blockExplorerUrl:
-                    BUILT_IN_NETWORKS[networkType].blockExplorerUrl,
+                  blockExplorerUrl: 'https://test-block-explorer-1.com',
                 },
+                id: 'testNetworkConfigurationId1',
               });
             },
           );
@@ -4385,15 +5787,15 @@ describe('NetworkController', () => {
                 },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls();
-              const network2 = network1.with({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
                 networkClientType: 'custom',
                 networkClientOptions: {
                   customRpcUrl: 'https://mock-rpc-url',
                 },
               });
-              network2.mockEssentialRpcCalls();
+              currentNetwork.mockEssentialRpcCalls();
+              previousNetwork.mockEssentialRpcCalls();
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: () => {
@@ -4419,7 +5821,7 @@ describe('NetworkController', () => {
           );
         });
 
-        it('resets the network state to "loading" before emitting networkDidChange', async () => {
+        it('resets the network status to "unknown" before emitting networkDidChange', async () => {
           await withController(
             {
               state: {
@@ -4444,21 +5846,15 @@ describe('NetworkController', () => {
                 },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls();
-              const network2 = network1.with({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
                 networkClientType: 'custom',
                 networkClientOptions: {
                   customRpcUrl: 'https://mock-rpc-url',
                 },
               });
-              network2.mockEssentialRpcCalls({
-                net_version: {
-                  response: {
-                    result: '255',
-                  },
-                },
-              });
+              currentNetwork.mockEssentialRpcCalls();
+              previousNetwork.mockEssentialRpcCalls();
 
               await waitForLookupNetworkToComplete({
                 controller,
@@ -4466,14 +5862,16 @@ describe('NetworkController', () => {
                   controller.setActiveNetwork('testNetworkConfigurationId');
                 },
               });
-              expect(controller.store.getState().network).toBe('255');
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
 
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: async () => {
                   await waitForStateChanges({
                     controller,
-                    propertyPath: ['network'],
+                    propertyPath: ['networkStatus'],
                     // We only care about the first state change, because it
                     // happens before networkDidChange
                     count: 1,
@@ -4481,14 +5879,16 @@ describe('NetworkController', () => {
                       controller.rollbackToPreviousProvider();
                     },
                   });
-                  expect(controller.store.getState().network).toBe('loading');
+                  expect(controller.store.getState().networkStatus).toBe(
+                    'unknown',
+                  );
                 },
               });
             },
           );
         });
 
-        it('resets EIP support for the network before emitting networkDidChange', async () => {
+        it('clears EIP-1559 support for the network from state before emitting networkDidChange', async () => {
           await withController(
             {
               state: {
@@ -4513,17 +5913,17 @@ describe('NetworkController', () => {
                 },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls();
-              const network2 = network1.with({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
                 networkClientType: 'custom',
                 networkClientOptions: {
                   customRpcUrl: 'https://mock-rpc-url',
                 },
               });
-              network2.mockEssentialRpcCalls({
+              currentNetwork.mockEssentialRpcCalls({
                 latestBlock: POST_1559_BLOCK,
               });
+              previousNetwork.mockEssentialRpcCalls();
 
               await waitForLookupNetworkToComplete({
                 controller,
@@ -4563,7 +5963,7 @@ describe('NetworkController', () => {
           );
         });
 
-        it(`initializes a provider pointed to the ${nickname} Infura network (chainId: ${chainId})`, async () => {
+        it(`initializes a provider pointed to the "${networkType}" Infura network (chainId: ${chainId})`, async () => {
           await withController(
             {
               state: {
@@ -4588,15 +5988,15 @@ describe('NetworkController', () => {
                 },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls();
-              const network2 = network1.with({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
                 networkClientType: 'custom',
                 networkClientOptions: {
                   customRpcUrl: 'https://mock-rpc-url',
                 },
               });
-              network2.mockEssentialRpcCalls();
+              currentNetwork.mockEssentialRpcCalls();
+              previousNetwork.mockEssentialRpcCalls();
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: () => {
@@ -4648,15 +6048,15 @@ describe('NetworkController', () => {
                 },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls();
-              const network2 = network1.with({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
                 networkClientType: 'custom',
                 networkClientOptions: {
                   customRpcUrl: 'https://mock-rpc-url',
                 },
               });
-              network2.mockEssentialRpcCalls();
+              currentNetwork.mockEssentialRpcCalls();
+              previousNetwork.mockEssentialRpcCalls();
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: () => {
@@ -4708,15 +6108,15 @@ describe('NetworkController', () => {
                 },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls();
-              const network2 = network1.with({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
                 networkClientType: 'custom',
                 networkClientOptions: {
                   customRpcUrl: 'https://mock-rpc-url',
                 },
               });
-              network2.mockEssentialRpcCalls();
+              currentNetwork.mockEssentialRpcCalls();
+              previousNetwork.mockEssentialRpcCalls();
 
               await waitForLookupNetworkToComplete({
                 controller,
@@ -4742,7 +6142,7 @@ describe('NetworkController', () => {
           );
         });
 
-        it('emits infuraIsUnblocked (assuming that the request for eth_blockNumber responds successfully)', async () => {
+        it('emits infuraIsBlocked or infuraIsUnblocked, depending on whether Infura is blocking requests for the previous network', async () => {
           const messenger = buildMessenger();
 
           await withController(
@@ -4755,11 +6155,6 @@ describe('NetworkController', () => {
                   // the network selected, it just needs to exist
                   chainId: '0x9999999',
                 },
-                networkDetails: {
-                  EIPS: {
-                    1559: false,
-                  },
-                },
                 networkConfigurations: {
                   testNetworkConfigurationId: {
                     id: 'testNetworkConfigurationId',
@@ -4770,103 +6165,117 @@ describe('NetworkController', () => {
                 },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls();
-              const network2 = network1.with({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
                 networkClientType: 'custom',
                 networkClientOptions: {
                   customRpcUrl: 'https://mock-rpc-url',
                 },
               });
-              network2.mockEssentialRpcCalls();
-
+              currentNetwork.mockEssentialRpcCalls();
+              previousNetwork.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: BLOCKED_INFURA_RESPONSE,
+                },
+              });
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: () => {
                   controller.setActiveNetwork('testNetworkConfigurationId');
                 },
               });
+              const promiseForNoInfuraIsUnblockedEvents =
+                waitForPublishedEvents({
+                  messenger,
+                  eventType: 'NetworkController:infuraIsUnblocked',
+                  count: 0,
+                });
+              const promiseForInfuraIsBlocked = waitForPublishedEvents({
+                messenger,
+                eventType: 'NetworkController:infuraIsBlocked',
+              });
 
               await waitForLookupNetworkToComplete({
                 controller,
                 operation: async () => {
-                  const infuraIsUnblocked = await waitForPublishedEvents({
-                    messenger,
-                    eventType: 'NetworkController:infuraIsUnblocked',
-                    operation: () => {
-                      controller.rollbackToPreviousProvider();
-                    },
-                  });
-
-                  expect(infuraIsUnblocked).toBeTruthy();
+                  controller.rollbackToPreviousProvider();
                 },
               });
+
+              expect(await promiseForNoInfuraIsUnblockedEvents).toBeTruthy();
+              expect(await promiseForInfuraIsBlocked).toBeTruthy();
             },
           );
         });
 
-        it(`persists "${networkVersion}" to state as the network version of ${nickname}`, async () => {
+        it('checks the status of the previous network again and updates state accordingly', async () => {
+          const previousProvider = {
+            type: networkType,
+            // NOTE: This doesn't need to match the logical chain ID of
+            // the network selected, it just needs to exist
+            chainId: '0x9999999',
+          };
+          const currentNetworkConfiguration = {
+            id: 'currentNetworkConfiguration',
+            rpcUrl: 'https://mock-rpc-url',
+            chainId: '0x1337',
+            ticker: 'TEST',
+          };
           await withController(
             {
               state: {
-                provider: {
-                  type: networkType,
-                  // NOTE: This doesn't need to match the logical chain ID of
-                  // the network selected, it just needs to exist
-                  chainId: '0x9999999',
-                },
-                networkDetails: {
-                  EIPS: {
-                    1559: false,
-                  },
-                },
+                provider: previousProvider,
                 networkConfigurations: {
-                  testNetworkConfigurationId: {
-                    id: 'testNetworkConfigurationId',
-                    rpcUrl: 'https://mock-rpc-url',
-                    chainId: '0xtest',
-                    ticker: 'TEST',
-                  },
+                  currentNetworkConfiguration,
                 },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls();
-              const network2 = network1.with({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
                 networkClientType: 'custom',
                 networkClientOptions: {
                   customRpcUrl: 'https://mock-rpc-url',
                 },
               });
-              network2.mockEssentialRpcCalls({
+              currentNetwork.mockEssentialRpcCalls({
                 net_version: {
                   response: {
-                    result: '255',
+                    error: 'some error',
+                    httpStatus: 405,
                   },
                 },
               });
-
-              await waitForLookupNetworkToComplete({
-                controller,
-                operation: () => {
-                  controller.setActiveNetwork('testNetworkConfigurationId');
+              previousNetwork.mockEssentialRpcCalls({
+                eth_getBlockByNumber: {
+                  response: SUCCESSFUL_ETH_GET_BLOCK_BY_NUMBER_RESPONSE,
                 },
               });
-              expect(controller.store.getState().network).toBe('255');
+
+              await waitForStateChanges({
+                controller,
+                propertyPath: ['networkStatus'],
+                operation: () => {
+                  controller.setActiveNetwork('currentNetworkConfiguration');
+                },
+              });
+              expect(controller.store.getState().networkStatus).toBe(
+                'unavailable',
+              );
 
               await waitForLookupNetworkToComplete({
                 controller,
-                numberOfNetworkDetailsChanges: 2,
                 operation: () => {
                   controller.rollbackToPreviousProvider();
                 },
               });
-              expect(controller.store.getState().network).toBe(networkVersion);
+              expect(controller.store.getState().networkStatus).toBe(
+                'available',
+              );
             },
           );
         });
 
-        it('persists to state whether the network supports EIP-1559 (assuming that the request for eth_getBlockByNumber responds successfully)', async () => {
+        it('checks whether the previous network supports EIP-1559 again and updates state accordingly', async () => {
           await withController(
             {
               state: {
@@ -4886,24 +6295,19 @@ describe('NetworkController', () => {
                 },
               },
             },
-            async ({ controller, network: network1 }) => {
-              network1.mockEssentialRpcCalls({
+            async ({ controller, network: previousNetwork }) => {
+              const currentNetwork = new NetworkCommunications({
+                networkClientType: 'custom',
+                networkClientOptions: {
+                  customRpcUrl: 'https://mock-rpc-url',
+                },
+              });
+              currentNetwork.mockEssentialRpcCalls({
+                latestBlock: PRE_1559_BLOCK,
+              });
+              previousNetwork.mockEssentialRpcCalls({
                 latestBlock: POST_1559_BLOCK,
               });
-              const network2 = network1.with({
-                networkClientType: 'custom',
-                networkClientOptions: {
-                  customRpcUrl: 'https://mock-rpc-url',
-                },
-              });
-              network2.mockEssentialRpcCalls({
-                latestBlock: PRE_1559_BLOCK,
-                net_version: {
-                  response: {
-                    result: '99999',
-                  },
-                },
-              });
 
               await waitForLookupNetworkToComplete({
                 controller,
@@ -4911,9 +6315,11 @@ describe('NetworkController', () => {
                   controller.setActiveNetwork('testNetworkConfigurationId');
                 },
               });
-              expect(
-                controller.store.getState().networkDetails.EIPS['1559'],
-              ).toBe(false);
+              expect(controller.store.getState().networkDetails).toStrictEqual({
+                EIPS: {
+                  1559: false,
+                },
+              });
 
               await waitForLookupNetworkToComplete({
                 controller,
@@ -4922,9 +6328,11 @@ describe('NetworkController', () => {
                   controller.rollbackToPreviousProvider();
                 },
               });
-              expect(
-                controller.store.getState().networkDetails.EIPS['1559'],
-              ).toBe(true);
+              expect(controller.store.getState().networkDetails).toStrictEqual({
+                EIPS: {
+                  1559: true,
+                },
+              });
             },
           );
         });
@@ -4976,15 +6384,15 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls();
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls();
+            currentNetwork.mockEssentialRpcCalls();
+            previousNetwork.mockEssentialRpcCalls();
 
             await waitForLookupNetworkToComplete({
               controller,
@@ -5054,15 +6462,15 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls();
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls();
+            currentNetwork.mockEssentialRpcCalls();
+            previousNetwork.mockEssentialRpcCalls();
             await waitForLookupNetworkToComplete({
               controller,
               operation: () => {
@@ -5088,7 +6496,7 @@ describe('NetworkController', () => {
         );
       });
 
-      it('resets the network state to "loading" before emitting networkDidChange', async () => {
+      it('resets the network state to "unknown" before emitting networkDidChange', async () => {
         await withController(
           {
             state: {
@@ -5109,15 +6517,15 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls();
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls();
+            currentNetwork.mockEssentialRpcCalls();
+            previousNetwork.mockEssentialRpcCalls();
 
             await waitForLookupNetworkToComplete({
               controller,
@@ -5125,14 +6533,14 @@ describe('NetworkController', () => {
                 controller.setProviderType('goerli');
               },
             });
-            expect(controller.store.getState().network).toBe('5');
+            expect(controller.store.getState().networkStatus).toBe('available');
 
             await waitForLookupNetworkToComplete({
               controller,
               operation: async () => {
                 await waitForStateChanges({
                   controller,
-                  propertyPath: ['network'],
+                  propertyPath: ['networkStatus'],
                   // We only care about the first state change, because it
                   // happens before networkDidChange
                   count: 1,
@@ -5140,14 +6548,16 @@ describe('NetworkController', () => {
                     controller.rollbackToPreviousProvider();
                   },
                 });
-                expect(controller.store.getState().network).toBe('loading');
+                expect(controller.store.getState().networkStatus).toBe(
+                  'unknown',
+                );
               },
             });
           },
         );
       });
 
-      it('resets EIP support for the network before emitting networkDidChange', async () => {
+      it('clears EIP-1559 support for the network from state before emitting networkDidChange', async () => {
         await withController(
           {
             state: {
@@ -5168,17 +6578,17 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls();
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls({
+            currentNetwork.mockEssentialRpcCalls({
               latestBlock: POST_1559_BLOCK,
             });
+            previousNetwork.mockEssentialRpcCalls();
 
             await waitForLookupNetworkToComplete({
               controller,
@@ -5239,15 +6649,15 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls();
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls();
+            currentNetwork.mockEssentialRpcCalls();
+            previousNetwork.mockEssentialRpcCalls();
             await waitForLookupNetworkToComplete({
               controller,
               operation: () => {
@@ -5295,15 +6705,15 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls();
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls();
+            currentNetwork.mockEssentialRpcCalls();
+            previousNetwork.mockEssentialRpcCalls();
             await waitForLookupNetworkToComplete({
               controller,
               operation: () => {
@@ -5351,15 +6761,15 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls();
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls();
+            currentNetwork.mockEssentialRpcCalls();
+            previousNetwork.mockEssentialRpcCalls();
 
             await waitForLookupNetworkToComplete({
               controller,
@@ -5409,15 +6819,15 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls();
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls();
+            currentNetwork.mockEssentialRpcCalls();
+            previousNetwork.mockEssentialRpcCalls();
 
             await waitForLookupNetworkToComplete({
               controller,
@@ -5444,7 +6854,7 @@ describe('NetworkController', () => {
         );
       });
 
-      it('persists the network version to state (assuming that the request for net_version responds successfully)', async () => {
+      it('checks the status of the previous network again and updates state accordingly', async () => {
         await withController(
           {
             state: {
@@ -5465,21 +6875,23 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls({
-              net_version: {
-                response: {
-                  result: '42',
-                },
-              },
-            });
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls();
+            currentNetwork.mockEssentialRpcCalls({
+              // This results in a successful call to eth_getBlockByNumber
+              // implicitly
+              latestBlock: BLOCK,
+            });
+            previousNetwork.mockEssentialRpcCalls({
+              net_version: {
+                response: UNSUCCESSFUL_JSON_RPC_RESPONSE,
+              },
+            });
 
             await waitForLookupNetworkToComplete({
               controller,
@@ -5487,7 +6899,7 @@ describe('NetworkController', () => {
                 controller.setProviderType('goerli');
               },
             });
-            expect(controller.store.getState().network).toBe('5');
+            expect(controller.store.getState().networkStatus).toBe('available');
 
             await waitForLookupNetworkToComplete({
               controller,
@@ -5495,12 +6907,12 @@ describe('NetworkController', () => {
                 controller.rollbackToPreviousProvider();
               },
             });
-            expect(controller.store.getState().network).toBe('42');
+            expect(controller.store.getState().networkStatus).toBe('unknown');
           },
         );
       });
 
-      it('persists to state whether the network supports EIP-1559 (assuming that the request for eth_getBlockByNumber responds successfully)', async () => {
+      it('checks whether the previous network supports EIP-1559 again and updates state accordingly', async () => {
         await withController(
           {
             state: {
@@ -5521,24 +6933,19 @@ describe('NetworkController', () => {
               },
             },
           },
-          async ({ controller, network: network1 }) => {
-            network1.mockEssentialRpcCalls({
-              latestBlock: POST_1559_BLOCK,
-              net_version: {
-                response: {
-                  result: '99999',
-                },
-              },
-            });
-            const network2 = network1.with({
+          async ({ controller, network: previousNetwork }) => {
+            const currentNetwork = new NetworkCommunications({
               networkClientType: 'infura',
               networkClientOptions: {
                 infuraNetwork: 'goerli',
               },
             });
-            network2.mockEssentialRpcCalls({
+            currentNetwork.mockEssentialRpcCalls({
               latestBlock: PRE_1559_BLOCK,
             });
+            previousNetwork.mockEssentialRpcCalls({
+              latestBlock: POST_1559_BLOCK,
+            });
 
             await waitForLookupNetworkToComplete({
               controller,
@@ -5546,9 +6953,11 @@ describe('NetworkController', () => {
                 controller.setProviderType('goerli');
               },
             });
-            expect(
-              controller.store.getState().networkDetails.EIPS['1559'],
-            ).toBe(false);
+            expect(controller.store.getState().networkDetails).toStrictEqual({
+              EIPS: {
+                1559: false,
+              },
+            });
 
             await waitForLookupNetworkToComplete({
               controller,
@@ -5556,14 +6965,17 @@ describe('NetworkController', () => {
                 controller.rollbackToPreviousProvider();
               },
             });
-            expect(
-              controller.store.getState().networkDetails.EIPS['1559'],
-            ).toBe(true);
+            expect(controller.store.getState().networkDetails).toStrictEqual({
+              EIPS: {
+                1559: true,
+              },
+            });
           },
         );
       });
     });
   });
+
   describe('upsertNetworkConfiguration', () => {
     it('throws if the given chain ID is not a 0x-prefixed hex number', async () => {
       const invalidChainId = '1';
@@ -5996,6 +7408,13 @@ describe('NetworkController', () => {
           },
         },
         async ({ controller }) => {
+          const network = new NetworkCommunications({
+            networkClientType: 'custom',
+            networkClientOptions: {
+              customRpcUrl: 'https://test-rpc-url',
+            },
+          });
+          network.mockEssentialRpcCalls();
           const rpcUrlNetwork = {
             chainId: '0x1',
             rpcUrl: 'https://test-rpc-url',
@@ -6536,7 +7955,9 @@ async function waitForPublishedEvents({
     resetTimer();
   });
 
-  await operation();
+  if (operation) {
+    await operation();
+  }
 
   return await promiseForEventPayloads;
 }
diff --git a/app/scripts/controllers/swaps.js b/app/scripts/controllers/swaps.js
index f9737ef3a..ab6105ecf 100644
--- a/app/scripts/controllers/swaps.js
+++ b/app/scripts/controllers/swaps.js
@@ -17,7 +17,7 @@ import {
   SWAPS_CHAINID_CONTRACT_ADDRESS_MAP,
 } from '../../../shared/constants/swaps';
 import { GasEstimateTypes } from '../../../shared/constants/gas';
-import { CHAIN_IDS } from '../../../shared/constants/network';
+import { CHAIN_IDS, NetworkStatus } from '../../../shared/constants/network';
 import {
   FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME,
   FALLBACK_SMART_TRANSACTIONS_DEADLINE,
@@ -136,10 +136,14 @@ export default class SwapsController {
     this.indexOfNewestCallInFlight = 0;
 
     this.ethersProvider = new Web3Provider(provider);
-    this._currentNetwork = networkController.store.getState().network;
-    onNetworkDidChange((network) => {
-      if (network !== 'loading' && network !== this._currentNetwork) {
-        this._currentNetwork = network;
+    this._currentNetworkId = networkController.store.getState().networkId;
+    onNetworkDidChange(() => {
+      const { networkId, networkStatus } = networkController.store.getState();
+      if (
+        networkStatus === NetworkStatus.Available &&
+        networkId !== this._currentNetworkId
+      ) {
+        this._currentNetworkId = networkId;
         this.ethersProvider = new Web3Provider(provider);
       }
     });
diff --git a/app/scripts/controllers/swaps.test.js b/app/scripts/controllers/swaps.test.js
index cebf695ae..648f57ccc 100644
--- a/app/scripts/controllers/swaps.test.js
+++ b/app/scripts/controllers/swaps.test.js
@@ -4,7 +4,11 @@ import sinon from 'sinon';
 import { BigNumber } from '@ethersproject/bignumber';
 import { mapValues } from 'lodash';
 import BigNumberjs from 'bignumber.js';
-import { CHAIN_IDS, NETWORK_IDS } from '../../../shared/constants/network';
+import {
+  CHAIN_IDS,
+  NETWORK_IDS,
+  NetworkStatus,
+} from '../../../shared/constants/network';
 import { ETH_SWAPS_TOKEN_OBJECT } from '../../../shared/constants/swaps';
 import { createTestProviderTools } from '../../../test/stub/provider';
 import { SECOND } from '../../../shared/constants/time';
@@ -97,11 +101,10 @@ const MOCK_GET_BUFFERED_GAS_LIMIT = async () => ({
 function getMockNetworkController() {
   return {
     store: {
-      getState: () => {
-        return {
-          network: NETWORK_IDS.GOERLI,
-        };
-      },
+      getState: sinon.stub().returns({
+        networkId: NETWORK_IDS.GOERLI,
+        networkStatus: NetworkStatus.Available,
+      }),
     },
   };
 }
@@ -219,6 +222,10 @@ describe('SwapsController', function () {
       const currentEthersInstance = swapsController.ethersProvider;
       const changeNetwork = onNetworkDidChange.getCall(0).args[0];
 
+      networkController.store.getState.returns({
+        networkId: NETWORK_IDS.MAINNET,
+        networkStatus: NetworkStatus.Available,
+      });
       changeNetwork(NETWORK_IDS.MAINNET);
 
       const newEthersInstance = swapsController.ethersProvider;
@@ -245,6 +252,10 @@ describe('SwapsController', function () {
       const currentEthersInstance = swapsController.ethersProvider;
       const changeNetwork = onNetworkDidChange.getCall(0).args[0];
 
+      networkController.store.getState.returns({
+        networkId: null,
+        networkStatus: NetworkStatus.Unknown,
+      });
       changeNetwork('loading');
 
       const newEthersInstance = swapsController.ethersProvider;
@@ -271,6 +282,10 @@ describe('SwapsController', function () {
       const currentEthersInstance = swapsController.ethersProvider;
       const changeNetwork = onNetworkDidChange.getCall(0).args[0];
 
+      networkController.store.getState.returns({
+        networkId: NETWORK_IDS.GOERLI,
+        networkStatus: NetworkStatus.Available,
+      });
       changeNetwork(NETWORK_IDS.GOERLI);
 
       const newEthersInstance = swapsController.ethersProvider;
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 112071ffd..a98ee441d 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -44,6 +44,7 @@ import {
   HARDFORKS,
   CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP,
   NETWORK_TYPES,
+  NetworkStatus,
 } from '../../../../shared/constants/network';
 import {
   determineTransactionAssetType,
@@ -115,7 +116,8 @@ const METRICS_STATUS_FAILED = 'failed on-chain';
  *
  * @param {object} opts
  * @param {object} opts.initState - initial transaction list default is an empty array
- * @param {Function} opts.getNetworkState - Get the current network state.
+ * @param {Function} opts.getNetworkId - Get the current network ID.
+ * @param {Function} opts.getNetworkStatus - Get the current network status.
  * @param {Function} opts.onNetworkStateChange - Subscribe to network state change events.
  * @param {object} opts.blockTracker - An instance of eth-blocktracker
  * @param {object} opts.provider - A network provider.
@@ -129,7 +131,8 @@ const METRICS_STATUS_FAILED = 'failed on-chain';
 export default class TransactionController extends EventEmitter {
   constructor(opts) {
     super();
-    this.getNetworkState = opts.getNetworkState;
+    this.getNetworkId = opts.getNetworkId;
+    this.getNetworkStatus = opts.getNetworkStatus;
     this._getCurrentChainId = opts.getCurrentChainId;
     this.getProviderConfig = opts.getProviderConfig;
     this._getCurrentNetworkEIP1559Compatibility =
@@ -167,7 +170,8 @@ export default class TransactionController extends EventEmitter {
     this.txStateManager = new TransactionStateManager({
       initState: opts.initState,
       txHistoryLimit: opts.txHistoryLimit,
-      getNetworkState: this.getNetworkState,
+      getNetworkId: this.getNetworkId,
+      getNetworkStatus: this.getNetworkStatus,
       getCurrentChainId: opts.getCurrentChainId,
     });
 
@@ -226,10 +230,13 @@ export default class TransactionController extends EventEmitter {
    * @returns {number} The numerical chainId.
    */
   getChainId() {
-    const networkState = this.getNetworkState();
+    const networkStatus = this.getNetworkStatus();
     const chainId = this._getCurrentChainId();
     const integerChainId = parseInt(chainId, 16);
-    if (networkState === 'loading' || Number.isNaN(integerChainId)) {
+    if (
+      networkStatus !== NetworkStatus.Available ||
+      Number.isNaN(integerChainId)
+    ) {
       return 0;
     }
     return integerChainId;
@@ -272,12 +279,13 @@ export default class TransactionController extends EventEmitter {
       });
     }
 
-    // For 'rpc' we need to use the same basic configuration as mainnet,
-    // since we only support EVM compatible chains, and then override the
+    // For 'rpc' we need to use the same basic configuration as mainnet, since
+    // we only support EVM compatible chains, and then override the
     // name, chainId and networkId properties. This is done using the
     // `forCustomChain` static method on the Common class.
     const chainId = parseInt(this._getCurrentChainId(), 16);
-    const networkId = this.getNetworkState();
+    const networkStatus = this.getNetworkStatus();
+    const networkId = this.getNetworkId();
 
     const customChainParams = {
       name,
@@ -291,7 +299,8 @@ export default class TransactionController extends EventEmitter {
       // on a custom network that requires valid network id. I have not ran
       // into this limitation on any network I have attempted, even when
       // hardcoding networkId to 'loading'.
-      networkId: networkId === 'loading' ? 0 : parseInt(networkId, 10),
+      networkId:
+        networkStatus === NetworkStatus.Available ? parseInt(networkId, 10) : 0,
     };
 
     return Common.forCustomChain(
diff --git a/app/scripts/controllers/transactions/index.test.js b/app/scripts/controllers/transactions/index.test.js
index 096783fae..99b2cd4b1 100644
--- a/app/scripts/controllers/transactions/index.test.js
+++ b/app/scripts/controllers/transactions/index.test.js
@@ -27,12 +27,14 @@ import {
 } from '../../../../shared/constants/gas';
 import { METAMASK_CONTROLLER_EVENTS } from '../../metamask-controller';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
+import { NetworkStatus } from '../../../../shared/constants/network';
 import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../../shared/lib/transactions-controller-utils';
 import TransactionController from '.';
 
 const noop = () => true;
 const currentNetworkId = '5';
 const currentChainId = '0x5';
+const currentNetworkStatus = NetworkStatus.Available;
 const providerConfig = {
   type: 'goerli',
 };
@@ -46,7 +48,8 @@ describe('Transaction Controller', function () {
     providerResultStub,
     fromAccount,
     fragmentExists,
-    networkStore;
+    networkStatusStore,
+    getCurrentChainId;
 
   beforeEach(function () {
     fragmentExists = false;
@@ -59,22 +62,27 @@ describe('Transaction Controller', function () {
     provider = createTestProviderTools({
       scaffold: providerResultStub,
       networkId: currentNetworkId,
-      chainId: currentNetworkId,
+      chainId: parseInt(currentChainId, 16),
     }).provider;
 
-    networkStore = new ObservableStore(currentNetworkId);
+    networkStatusStore = new ObservableStore(currentNetworkStatus);
 
     fromAccount = getTestAccounts()[0];
     const blockTrackerStub = new EventEmitter();
     blockTrackerStub.getCurrentBlock = noop;
     blockTrackerStub.getLatestBlock = noop;
+
+    getCurrentChainId = sinon.stub().callsFake(() => currentChainId);
+
     txController = new TransactionController({
       provider,
       getGasPrice() {
         return '0xee6b2800';
       },
-      getNetworkState: () => networkStore.getState(),
-      onNetworkStateChange: (listener) => networkStore.subscribe(listener),
+      getNetworkId: () => currentNetworkId,
+      getNetworkStatus: () => networkStatusStore.getState(),
+      onNetworkStateChange: (listener) =>
+        networkStatusStore.subscribe(listener),
       getCurrentNetworkEIP1559Compatibility: () => Promise.resolve(false),
       getCurrentAccountEIP1559Compatibility: () => false,
       txHistoryLimit: 10,
@@ -85,7 +93,7 @@ describe('Transaction Controller', function () {
         }),
       getProviderConfig: () => providerConfig,
       getPermittedAccounts: () => undefined,
-      getCurrentChainId: () => currentChainId,
+      getCurrentChainId,
       getParticipateInMetrics: () => false,
       trackMetaMetricsEvent: () => undefined,
       createEventFragment: () => undefined,
@@ -467,8 +475,8 @@ describe('Transaction Controller', function () {
       );
     });
 
-    it('should fail if netId is loading', async function () {
-      networkStore.putState('loading');
+    it('should fail if the network status is not "available"', async function () {
+      networkStatusStore.putState(NetworkStatus.Unknown);
       await assert.rejects(
         () =>
           txController.addUnapprovedTransaction(undefined, {
@@ -1079,8 +1087,19 @@ describe('Transaction Controller', function () {
   });
 
   describe('#getChainId', function () {
-    it('returns 0 when the chainId is NaN', function () {
-      networkStore.putState('loading');
+    it('returns the chain ID of the network when it is available', function () {
+      networkStatusStore.putState(NetworkStatus.Available);
+      assert.equal(txController.getChainId(), 5);
+    });
+
+    it('returns 0 when the network is not available', function () {
+      networkStatusStore.putState('asdflsfadf');
+      assert.equal(txController.getChainId(), 0);
+    });
+
+    it('returns 0 when the chain ID cannot be parsed as a hex string', function () {
+      networkStatusStore.putState(NetworkStatus.Available);
+      getCurrentChainId.returns('$fdsjfldf');
       assert.equal(txController.getChainId(), 0);
     });
   });
diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
index bd8e38051..98d18bca1 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -7,6 +7,7 @@ import { TransactionStatus } from '../../../../shared/constants/transaction';
 import { METAMASK_CONTROLLER_EVENTS } from '../../metamask-controller';
 import { transactionMatchesNetwork } from '../../../../shared/modules/transaction.utils';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
+import { NetworkStatus } from '../../../../shared/constants/network';
 import {
   generateHistoryEntry,
   replayHistory,
@@ -54,13 +55,15 @@ export const ERROR_SUBMITTING =
  *  transactions list keyed by id
  * @param {number} [opts.txHistoryLimit] - limit for how many finished
  *  transactions can hang around in state
- * @param {Function} opts.getNetworkState - Get the current network state.
+ * @param {Function} opts.getNetworkId - Get the current network Id.
+ * @param {Function} opts.getNetworkStatus - Get the current network status.
  */
 export default class TransactionStateManager extends EventEmitter {
   constructor({
     initState,
     txHistoryLimit,
-    getNetworkState,
+    getNetworkId,
+    getNetworkStatus,
     getCurrentChainId,
   }) {
     super();
@@ -70,7 +73,8 @@ export default class TransactionStateManager extends EventEmitter {
       ...initState,
     });
     this.txHistoryLimit = txHistoryLimit;
-    this.getNetworkState = getNetworkState;
+    this.getNetworkId = getNetworkId;
+    this.getNetworkStatus = getNetworkStatus;
     this.getCurrentChainId = getCurrentChainId;
   }
 
@@ -86,9 +90,10 @@ export default class TransactionStateManager extends EventEmitter {
    * @returns {TransactionMeta} the default txMeta object
    */
   generateTxMeta(opts = {}) {
-    const netId = this.getNetworkState();
+    const networkId = this.getNetworkId();
+    const networkStatus = this.getNetworkStatus();
     const chainId = this.getCurrentChainId();
-    if (netId === 'loading') {
+    if (networkStatus !== NetworkStatus.Available) {
       throw new Error('MetaMask is having trouble connecting to the network');
     }
 
@@ -128,7 +133,7 @@ export default class TransactionStateManager extends EventEmitter {
       id: createId(),
       time: new Date().getTime(),
       status: TransactionStatus.unapproved,
-      metamaskNetworkId: netId,
+      metamaskNetworkId: networkId,
       originalGasEstimate: opts.txParams?.gas,
       userEditedGasLimit: false,
       chainId,
@@ -149,12 +154,12 @@ export default class TransactionStateManager extends EventEmitter {
    */
   getUnapprovedTxList() {
     const chainId = this.getCurrentChainId();
-    const network = this.getNetworkState();
+    const networkId = this.getNetworkId();
     return pickBy(
       this.store.getState().transactions,
       (transaction) =>
         transaction.status === TransactionStatus.unapproved &&
-        transactionMatchesNetwork(transaction, chainId, network),
+        transactionMatchesNetwork(transaction, chainId, networkId),
     );
   }
 
@@ -413,7 +418,7 @@ export default class TransactionStateManager extends EventEmitter {
     limit,
   } = {}) {
     const chainId = this.getCurrentChainId();
-    const network = this.getNetworkState();
+    const networkId = this.getNetworkId();
     // searchCriteria is an object that might have values that aren't predicate
     // methods. When providing any other value type (string, number, etc), we
     // consider this shorthand for "check the value at key for strict equality
@@ -442,7 +447,7 @@ export default class TransactionStateManager extends EventEmitter {
         // when filterToCurrentNetwork is true.
         if (
           filterToCurrentNetwork &&
-          transactionMatchesNetwork(transaction, chainId, network) === false
+          transactionMatchesNetwork(transaction, chainId, networkId) === false
         ) {
           return false;
         }
@@ -596,8 +601,7 @@ export default class TransactionStateManager extends EventEmitter {
   }
 
   /**
-   * Removes all transactions for the given address on the current network,
-   * preferring chainId for comparison over networkId.
+   * Removes all transactions for the given address on the current network.
    *
    * @param {string} address - hex string of the from address on the txParams
    *  to remove
@@ -605,8 +609,8 @@ export default class TransactionStateManager extends EventEmitter {
   wipeTransactions(address) {
     // network only tx
     const { transactions } = this.store.getState();
-    const network = this.getNetworkState();
     const chainId = this.getCurrentChainId();
+    const networkId = this.getNetworkId();
 
     // Update state
     this.store.updateState({
@@ -614,7 +618,7 @@ export default class TransactionStateManager extends EventEmitter {
         transactions,
         (transaction) =>
           transaction.txParams.from === address &&
-          transactionMatchesNetwork(transaction, chainId, network),
+          transactionMatchesNetwork(transaction, chainId, networkId),
       ),
     });
   }
diff --git a/app/scripts/controllers/transactions/tx-state-manager.test.js b/app/scripts/controllers/transactions/tx-state-manager.test.js
index 677f59334..a3b420e10 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.test.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.test.js
@@ -4,7 +4,11 @@ import {
   TransactionStatus,
   TransactionType,
 } from '../../../../shared/constants/transaction';
-import { CHAIN_IDS, NETWORK_IDS } from '../../../../shared/constants/network';
+import {
+  CHAIN_IDS,
+  NETWORK_IDS,
+  NetworkStatus,
+} from '../../../../shared/constants/network';
 import { GAS_LIMITS } from '../../../../shared/constants/gas';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
 import TxStateManager, { ERROR_SUBMITTING } from './tx-state-manager';
@@ -45,6 +49,7 @@ function generateTransactions(
 describe('TransactionStateManager', function () {
   let txStateManager;
   const currentNetworkId = NETWORK_IDS.GOERLI;
+  const currentNetworkStatus = NetworkStatus.Available;
   const currentChainId = CHAIN_IDS.MAINNET;
   const otherNetworkId = '2';
 
@@ -54,7 +59,8 @@ describe('TransactionStateManager', function () {
         transactions: {},
       },
       txHistoryLimit: 10,
-      getNetworkState: () => currentNetworkId,
+      getNetworkId: () => currentNetworkId,
+      getNetworkStatus: () => currentNetworkStatus,
       getCurrentChainId: () => currentChainId,
     });
   });
@@ -181,7 +187,8 @@ describe('TransactionStateManager', function () {
             [confirmedTx.id]: confirmedTx,
           },
         },
-        getNetworkState: () => currentNetworkId,
+        getNetworkId: () => currentNetworkId,
+        getNetworkStatus: () => currentNetworkStatus,
         getCurrentChainId: () => currentChainId,
       });
 
@@ -246,7 +253,8 @@ describe('TransactionStateManager', function () {
             [confirmedTx3.id]: confirmedTx3,
           },
         },
-        getNetworkState: () => currentNetworkId,
+        getNetworkId: () => currentNetworkId,
+        getNetworkStatus: () => currentNetworkStatus,
         getCurrentChainId: () => currentChainId,
       });
 
@@ -355,7 +363,8 @@ describe('TransactionStateManager', function () {
             [failedTx3Dupe.id]: failedTx3Dupe,
           },
         },
-        getNetworkState: () => currentNetworkId,
+        getNetworkId: () => currentNetworkId,
+        getNetworkStatus: () => currentNetworkStatus,
         getCurrentChainId: () => currentChainId,
       });
 
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 633ac770d..bc0150b84 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -52,7 +52,8 @@ export const SENTRY_STATE = {
     isUnlocked: true,
     metaMetricsId: true,
     nativeCurrency: true,
-    network: true,
+    networkId: true,
+    networkStatus: true,
     nextNonce: true,
     participateInMetaMetrics: true,
     preferences: true,
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 0f201d55e..d4fff36bb 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -74,7 +74,11 @@ import {
   GAS_DEV_API_BASE_URL,
   SWAPS_CLIENT_ID,
 } from '../../shared/constants/swaps';
-import { CHAIN_IDS, NETWORK_TYPES } from '../../shared/constants/network';
+import {
+  CHAIN_IDS,
+  NETWORK_TYPES,
+  NetworkStatus,
+} from '../../shared/constants/network';
 import { HardwareDeviceNames } from '../../shared/constants/hardware-wallets';
 import { KeyringType } from '../../shared/constants/keyring';
 import {
@@ -334,7 +338,7 @@ export default class MetamaskController extends EventEmitter {
       {
         onPreferencesStateChange: (listener) =>
           this.preferencesController.store.subscribe(listener),
-        onNetworkStateChange: (cb) =>
+        onNetworkStateChange: (cb) => {
           this.networkController.store.subscribe((networkState) => {
             const modifiedNetworkState = {
               ...networkState,
@@ -344,7 +348,8 @@ export default class MetamaskController extends EventEmitter {
               },
             };
             return cb(modifiedNetworkState);
-          }),
+          });
+        },
       },
       {
         provider: this.provider,
@@ -478,6 +483,8 @@ export default class MetamaskController extends EventEmitter {
       clientId: SWAPS_CLIENT_ID,
       getProvider: () =>
         this.networkController.getProviderAndBlockTracker().provider,
+      // NOTE: This option is inaccurately named; it should be called
+      // onNetworkDidChange
       onNetworkStateChange: networkControllerMessenger.subscribe.bind(
         networkControllerMessenger,
         NetworkControllerEventTypes.NetworkDidChange,
@@ -944,9 +951,11 @@ export default class MetamaskController extends EventEmitter {
         ),
       getCurrentAccountEIP1559Compatibility:
         this.getCurrentAccountEIP1559Compatibility.bind(this),
-      getNetworkState: () => this.networkController.store.getState().network,
+      getNetworkId: () => this.networkController.store.getState().networkId,
+      getNetworkStatus: () =>
+        this.networkController.store.getState().networkStatus,
       onNetworkStateChange: (listener) =>
-        this.networkController.networkStore.subscribe(listener),
+        this.networkController.networkIdStore.subscribe(listener),
       getCurrentChainId: () =>
         this.networkController.store.getState().provider.chainId,
       preferencesStore: this.preferencesController.store,
@@ -1144,7 +1153,8 @@ export default class MetamaskController extends EventEmitter {
             return cb(modifiedNetworkState);
           });
         },
-        getNetwork: () => this.networkController.store.getState().network,
+        getNetwork: () =>
+          this.networkController.store.getState().networkId ?? 'loading',
         getNonceLock: this.txController.nonceTracker.getNonceLock.bind(
           this.txController.nonceTracker,
         ),
@@ -1666,16 +1676,16 @@ export default class MetamaskController extends EventEmitter {
 
     function updatePublicConfigStore(memState) {
       const { chainId } = networkController.store.getState().provider;
-      if (memState.network !== 'loading') {
+      if (memState.networkStatus === NetworkStatus.Available) {
         publicConfigStore.putState(selectPublicState(chainId, memState));
       }
     }
 
-    function selectPublicState(chainId, { isUnlocked, network }) {
+    function selectPublicState(chainId, { isUnlocked, networkId }) {
       return {
         isUnlocked,
         chainId,
-        networkVersion: network,
+        networkVersion: networkId ?? 'loading',
       };
     }
 
@@ -1686,12 +1696,7 @@ export default class MetamaskController extends EventEmitter {
    * Gets relevant state for the provider of an external origin.
    *
    * @param {string} origin - The origin to get the provider state for.
-   * @returns {Promise<{
-   *  isUnlocked: boolean,
-   *  networkVersion: string,
-   *  chainId: string,
-   *  accounts: string[],
-   * }>} An object with relevant state properties.
+   * @returns {Promise<{ isUnlocked: boolean, networkVersion: string, chainId: string, accounts: string[] }>} An object with relevant state properties.
    */
   async getProviderState(origin) {
     return {
@@ -1709,10 +1714,10 @@ export default class MetamaskController extends EventEmitter {
    * @returns {object} An object with relevant network state properties.
    */
   getProviderNetworkState(memState) {
-    const { network } = memState || this.getState();
+    const { networkId } = memState || this.getState();
     return {
       chainId: this.networkController.store.getState().provider.chainId,
-      networkVersion: network,
+      networkVersion: networkId ?? 'loading',
     };
   }
 
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 7506c17cb..826e0236c 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -779,13 +779,13 @@ describe('MetaMaskController', function () {
         metamaskController.preferencesController,
         'getSelectedAddress',
       );
-      const getNetworkstub = sinon.stub(
+      const getNetworkIdStub = sinon.stub(
         metamaskController.txController.txStateManager,
-        'getNetworkState',
+        'getNetworkId',
       );
 
       selectedAddressStub.returns('0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc');
-      getNetworkstub.returns(42);
+      getNetworkIdStub.returns(42);
 
       metamaskController.txController.txStateManager._addTransactionsToState([
         createTxMeta({
diff --git a/app/scripts/migrations/083.test.js b/app/scripts/migrations/083.test.js
new file mode 100644
index 000000000..6e0f58998
--- /dev/null
+++ b/app/scripts/migrations/083.test.js
@@ -0,0 +1,103 @@
+import { migrate } from './083';
+
+describe('migration #83', () => {
+  it('updates the version metadata', async () => {
+    const originalVersionedData = buildOriginalVersionedData({
+      meta: {
+        version: 9999999,
+      },
+    });
+
+    const newVersionedData = await migrate(originalVersionedData);
+
+    expect(newVersionedData.meta).toStrictEqual({
+      version: 83,
+    });
+  });
+
+  it('does not change the state if the network controller state does not exist', async () => {
+    const originalVersionedData = buildOriginalVersionedData({
+      data: {
+        test: '123',
+      },
+    });
+
+    const newVersionedData = await migrate(originalVersionedData);
+
+    expect(newVersionedData.data).toStrictEqual(originalVersionedData.data);
+  });
+
+  const nonObjects = [undefined, null, 'test', 1, ['test']];
+  for (const invalidState of nonObjects) {
+    it(`does not change the state if the network controller state is ${invalidState}`, async () => {
+      const originalVersionedData = buildOriginalVersionedData({
+        data: {
+          NetworkController: invalidState,
+        },
+      });
+
+      const newVersionedData = await migrate(originalVersionedData);
+
+      expect(newVersionedData.data).toStrictEqual(originalVersionedData.data);
+    });
+  }
+
+  it('does not change the state if the network controller state does not include "network"', async () => {
+    const originalVersionedData = buildOriginalVersionedData({
+      data: {
+        NetworkController: {
+          test: '123',
+        },
+      },
+    });
+
+    const newVersionedData = await migrate(originalVersionedData);
+
+    expect(newVersionedData.data).toStrictEqual(originalVersionedData.data);
+  });
+
+  it('replaces "network" in the network controller state with "networkId": null, "networkStatus": "unknown" if it is "loading"', async () => {
+    const originalVersionedData = buildOriginalVersionedData({
+      data: {
+        NetworkController: {
+          network: 'loading',
+        },
+      },
+    });
+
+    const newVersionedData = await migrate(originalVersionedData);
+
+    expect(newVersionedData.data).toStrictEqual({
+      NetworkController: {
+        networkId: null,
+        networkStatus: 'unknown',
+      },
+    });
+  });
+
+  it('replaces "network" in the network controller state with "networkId": network, "networkStatus": "available" if it is not "loading"', async () => {
+    const originalVersionedData = buildOriginalVersionedData({
+      data: {
+        NetworkController: {
+          network: '12345',
+        },
+      },
+    });
+
+    const newVersionedData = await migrate(originalVersionedData);
+
+    expect(newVersionedData.data).toStrictEqual({
+      NetworkController: {
+        networkId: '12345',
+        networkStatus: 'available',
+      },
+    });
+  });
+});
+
+function buildOriginalVersionedData({ meta = {}, data = {} } = {}) {
+  return {
+    meta: { version: 999999, ...meta },
+    data: { ...data },
+  };
+}
diff --git a/app/scripts/migrations/083.ts b/app/scripts/migrations/083.ts
new file mode 100644
index 000000000..e55c1960c
--- /dev/null
+++ b/app/scripts/migrations/083.ts
@@ -0,0 +1,47 @@
+import { cloneDeep } from 'lodash';
+import { hasProperty, isObject } from '@metamask/utils';
+
+export const version = 83;
+
+/**
+ * The `network` property in state was replaced with `networkId` and `networkStatus`.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(originalVersionedData: {
+  meta: { version: number };
+  data: Record<string, unknown>;
+}) {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  versionedData.data = transformState(versionedData.data);
+  return versionedData;
+}
+
+function transformState(state: Record<string, unknown>) {
+  if (
+    !hasProperty(state, 'NetworkController') ||
+    !isObject(state.NetworkController) ||
+    !hasProperty(state.NetworkController, 'network')
+  ) {
+    return state;
+  }
+
+  const NetworkController = { ...state.NetworkController };
+
+  if (NetworkController.network === 'loading') {
+    NetworkController.networkId = null;
+    NetworkController.networkStatus = 'unknown';
+  } else {
+    NetworkController.networkId = NetworkController.network;
+    NetworkController.networkStatus = 'available';
+  }
+
+  delete NetworkController.network;
+
+  return { ...state, NetworkController };
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index fdd29924c..c3f8e515f 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -86,6 +86,7 @@ import m079 from './079';
 import m080 from './080';
 import * as m081 from './081';
 import * as m082 from './082';
+import * as m083 from './083';
 
 const migrations = [
   m002,
@@ -169,6 +170,7 @@ const migrations = [
   m080,
   m081,
   m082,
+  m083,
 ];
 
 export default migrations;
diff --git a/shared/constants/network.ts b/shared/constants/network.ts
index e2d6cf40e..1f20538c3 100644
--- a/shared/constants/network.ts
+++ b/shared/constants/network.ts
@@ -689,3 +689,30 @@ export const FEATURED_RPCS: RPCDefinition[] = [
 
 export const SHOULD_SHOW_LINEA_TESTNET_NETWORK =
   new Date().getTime() > Date.UTC(2023, 2, 28, 8);
+
+/**
+ * Represents the availability state of the currently selected network.
+ */
+export enum NetworkStatus {
+  /**
+   * The network may or may not be able to receive requests, but either no
+   * attempt has been made to determine this, or an attempt was made but was
+   * unsuccessful.
+   */
+  Unknown = 'unknown',
+  /**
+   * The network is able to receive and respond to requests.
+   */
+  Available = 'available',
+  /**
+   * The network is unable to receive and respond to requests for unknown
+   * reasons.
+   */
+  Unavailable = 'unavailable',
+  /**
+   * The network is not only unavailable, but is also inaccessible for the user
+   * specifically based on their location. This state only applies to Infura
+   * networks.
+   */
+  Blocked = 'blocked',
+}
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index 8f08aee96..93d4515f4 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -72,7 +72,8 @@
     "featureFlags": {
       "showIncomingTransactions": true
     },
-    "network": "5",
+    "networkId": "5",
+    "networkStatus": "available",
     "provider": {
       "type": "rpc",
       "chainId": "0x5",
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 6fffc84a9..81b4d6385 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -180,7 +180,8 @@ function defaultFixture() {
         traits: {},
       },
       NetworkController: {
-        network: '1337',
+        networkId: '1337',
+        networkStatus: 'available',
         provider: {
           chainId: CHAIN_IDS.LOCALHOST,
           nickname: 'Localhost 8545',
@@ -310,7 +311,8 @@ function onboardingFixture() {
         },
       },
       NetworkController: {
-        network: '1337',
+        networkId: '1337',
+        networkStatus: 'available',
         provider: {
           ticker: 'ETH',
           type: 'rpc',
@@ -487,15 +489,6 @@ class FixtureBuilder {
     return this;
   }
 
-  withNetworkControllerSupportEIP1559() {
-    merge(this.fixture.data.NetworkController, {
-      networkDetails: {
-        EIPS: { 1559: true },
-      },
-    });
-    return this;
-  }
-
   withNftController(data) {
     merge(
       this.fixture.data.NftController
diff --git a/test/e2e/tests/ens.spec.js b/test/e2e/tests/ens.spec.js
index f5e3536c0..3a0dffee1 100644
--- a/test/e2e/tests/ens.spec.js
+++ b/test/e2e/tests/ens.spec.js
@@ -25,6 +25,34 @@ describe('ENS', function () {
         };
       });
 
+    await mockServer
+      .forPost(infuraUrl)
+      .withJsonBodyIncluding({ method: 'eth_getBalance' })
+      .thenCallback(() => {
+        return {
+          statusCode: 200,
+          json: {
+            jsonrpc: '2.0',
+            id: '1111111111111111',
+            result: '0x1',
+          },
+        };
+      });
+
+    await mockServer
+      .forPost(infuraUrl)
+      .withJsonBodyIncluding({ method: 'eth_getBlockByNumber' })
+      .thenCallback(() => {
+        return {
+          statusCode: 200,
+          json: {
+            jsonrpc: '2.0',
+            id: '1111111111111111',
+            result: {},
+          },
+        };
+      });
+
     await mockServer
       .forPost(infuraUrl)
       .withJsonBodyIncluding({ method: 'eth_call' })
diff --git a/test/e2e/tests/send-eth.spec.js b/test/e2e/tests/send-eth.spec.js
index dbe952963..b5542c1cb 100644
--- a/test/e2e/tests/send-eth.spec.js
+++ b/test/e2e/tests/send-eth.spec.js
@@ -298,9 +298,11 @@ describe('Send ETH from dapp using advanced gas controls', function () {
         dapp: true,
         fixtures: new FixtureBuilder()
           .withPermissionControllerConnectedToTestDapp()
-          .withNetworkControllerSupportEIP1559()
           .build(),
-        ganacheOptions,
+        ganacheOptions: {
+          ...ganacheOptions,
+          hardfork: 'london',
+        },
         title: this.test.title,
       },
       async ({ driver }) => {
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js b/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js
index 776b2fe4a..e616f04a4 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.test.js
@@ -11,10 +11,8 @@ jest.mock('../../../../../app/scripts/lib/util', () => ({
 
 describe('Confirm Detail Row Component', () => {
   const mockState = {
-    appState: {
-      isLoading: false,
-    },
     metamask: {
+      networkStatus: 'available',
       provider: {
         type: 'rpc',
         chainId: '0x5',
diff --git a/ui/components/app/dropdowns/network-dropdown.test.js b/ui/components/app/dropdowns/network-dropdown.test.js
index 6e8ee65a6..a4a1f6398 100644
--- a/ui/components/app/dropdowns/network-dropdown.test.js
+++ b/ui/components/app/dropdowns/network-dropdown.test.js
@@ -21,7 +21,8 @@ describe('Network Dropdown', () => {
   describe('NetworkDropdown in appState in false', () => {
     const mockState = {
       metamask: {
-        network: '1',
+        networkId: '1',
+        networkStatus: 'available',
         provider: {
           type: 'test',
         },
@@ -55,7 +56,8 @@ describe('Network Dropdown', () => {
   describe('NetworkDropdown in appState is true and show test networks is true', () => {
     const mockState = {
       metamask: {
-        network: '1',
+        networkId: '1',
+        networkStatus: 'available',
         provider: {
           type: 'test',
         },
@@ -133,7 +135,8 @@ describe('Network Dropdown', () => {
   describe('NetworkDropdown in appState is true and show test networks is false', () => {
     const mockState = {
       metamask: {
-        network: '1',
+        networkId: '1',
+        networkStatus: 'available',
         provider: {
           type: 'test',
         },
diff --git a/ui/components/app/transaction-alerts/transaction-alerts.stories.js b/ui/components/app/transaction-alerts/transaction-alerts.stories.js
index 1edddfd2d..7cb5886fe 100644
--- a/ui/components/app/transaction-alerts/transaction-alerts.stories.js
+++ b/ui/components/app/transaction-alerts/transaction-alerts.stories.js
@@ -18,7 +18,7 @@ const customTransaction = ({
     userFeeLevel: estimateUsed ? 'low' : 'medium',
     blockNumber: `${10902987 + i}`,
     id: 4678200543090545 + i,
-    metamaskNetworkId: testData?.metamask?.network,
+    metamaskNetworkId: testData?.metamask?.networkId,
     chainId: testData?.metamask?.provider?.chainId,
     status: 'confirmed',
     time: 1600654021000,
diff --git a/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js b/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js
index 4d31dca27..04286b4f8 100644
--- a/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js
+++ b/ui/ducks/confirm-transaction/confirm-transaction.duck.test.js
@@ -343,7 +343,8 @@ describe('Confirm Transaction Duck', () => {
         metamask: {
           conversionRate: 468.58,
           currentCurrency: 'usd',
-          network: '5',
+          networkId: '5',
+          networkStatus: 'available',
           provider: {
             chainId: '0x5',
           },
@@ -368,7 +369,6 @@ describe('Confirm Transaction Duck', () => {
         },
         confirmTransaction: {},
       };
-
       const middlewares = [thunk];
       const mockStore = configureMockStore(middlewares);
       const store = mockStore(mockState);
diff --git a/ui/ducks/metamask/metamask.test.js b/ui/ducks/metamask/metamask.test.js
index 5f3a43f49..2ca94f71b 100644
--- a/ui/ducks/metamask/metamask.test.js
+++ b/ui/ducks/metamask/metamask.test.js
@@ -41,7 +41,8 @@ describe('MetaMask Reducers', () => {
         conversionRate: 1200.88200327,
         nativeCurrency: 'ETH',
         useCurrencyRateCheck: true,
-        network: '5',
+        networkId: '5',
+        networkStatus: 'available',
         provider: {
           type: 'testnet',
           chainId: '0x5',
diff --git a/ui/helpers/utils/tx-helper.ts b/ui/helpers/utils/tx-helper.ts
index 9c64a42c4..e29732d24 100644
--- a/ui/helpers/utils/tx-helper.ts
+++ b/ui/helpers/utils/tx-helper.ts
@@ -9,7 +9,7 @@ export default function txHelper(
   decryptMsgs: Record<string, any> | null,
   encryptionPublicKeyMsgs: Record<string, any> | null,
   typedMessages: Record<string, any> | null,
-  network?: string,
+  networkId?: string | null,
   chainId?: string,
 ): Record<string, any> {
   log.debug('tx-helper called with params:');
@@ -20,13 +20,13 @@ export default function txHelper(
     decryptMsgs,
     encryptionPublicKeyMsgs,
     typedMessages,
-    network,
+    networkId,
     chainId,
   });
 
-  const txValues = network
+  const txValues = networkId
     ? valuesFor(unapprovedTxs).filter((txMeta) =>
-        transactionMatchesNetwork(txMeta, chainId, network),
+        transactionMatchesNetwork(txMeta, chainId, networkId),
       )
     : valuesFor(unapprovedTxs);
   log.debug(`tx helper found ${txValues.length} unapproved txs`);
diff --git a/ui/index.js b/ui/index.js
index 32addfc26..aa4520883 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -160,7 +160,7 @@ async function startApp(metamaskState, backgroundConnection, opts) {
     metamaskState.unapprovedDecryptMsgs,
     metamaskState.unapprovedEncryptionPublicKeyMsgs,
     metamaskState.unapprovedTypedMessages,
-    metamaskState.network,
+    metamaskState.networkId,
     metamaskState.provider.chainId,
   );
   const numberOfUnapprovedTx = unapprovedTxsAll.length;
diff --git a/ui/pages/confirm-signature-request/index.js b/ui/pages/confirm-signature-request/index.js
index 1dd1cba87..51d977c00 100644
--- a/ui/pages/confirm-signature-request/index.js
+++ b/ui/pages/confirm-signature-request/index.js
@@ -63,7 +63,7 @@ const ConfirmTxScreen = ({ match }) => {
     unapprovedMsgs,
     unapprovedPersonalMsgs,
     unapprovedTypedMessages,
-    network,
+    networkId,
     blockGasLimit,
     provider: { chainId },
   } = useSelector((state) => state.metamask);
@@ -76,7 +76,7 @@ const ConfirmTxScreen = ({ match }) => {
       {},
       {},
       {},
-      network,
+      networkId,
       chainId,
     );
     if (unconfTxList.length === 0 && !sendTo && unapprovedMessagesTotal === 0) {
@@ -101,7 +101,7 @@ const ConfirmTxScreen = ({ match }) => {
         {},
         {},
         {},
-        network,
+        networkId,
         chainId,
       );
       const prevTxData = prevUnconfTxList[prevIndex] || {};
@@ -114,7 +114,7 @@ const ConfirmTxScreen = ({ match }) => {
       {},
       {},
       {},
-      network,
+      networkId,
       chainId,
     );
 
@@ -137,7 +137,7 @@ const ConfirmTxScreen = ({ match }) => {
     chainId,
     currentNetworkTxList,
     match,
-    network,
+    networkId,
     sendTo,
     unapprovedMessagesTotal,
     unapprovedTxs,
@@ -151,7 +151,7 @@ const ConfirmTxScreen = ({ match }) => {
       unapprovedMsgs,
       unapprovedPersonalMsgs,
       unapprovedTypedMessages,
-      network,
+      networkId,
       chainId,
     );
 
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
index 9abc1ee22..c3389f2b8 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -101,7 +101,7 @@ const mapStateToProps = (state, ownProps) => {
     conversionRate,
     identities,
     addressBook,
-    network,
+    networkId,
     unapprovedTxs,
     nextNonce,
     provider: { chainId },
@@ -160,7 +160,7 @@ const mapStateToProps = (state, ownProps) => {
 
   const currentNetworkUnapprovedTxs = Object.keys(unapprovedTxs)
     .filter((key) =>
-      transactionMatchesNetwork(unapprovedTxs[key], chainId, network),
+      transactionMatchesNetwork(unapprovedTxs[key], chainId, networkId),
     )
     .reduce((acc, key) => ({ ...acc, [key]: unapprovedTxs[key] }), {});
   const unapprovedTxCount = valuesFor(currentNetworkUnapprovedTxs).length;
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js
index 326af8c73..fbe72d8b4 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.test.js
@@ -33,6 +33,7 @@ const baseStore = {
     unapprovedTxs: {
       1: {
         id: 1,
+        metamaskNetworkId: '5',
         txParams: {
           from: '0x0',
           to: '0x85c1685cfceaa5c0bdb1609fc536e9a8387dd65e',
@@ -58,6 +59,7 @@ const baseStore = {
         accounts: ['0x0'],
       },
     ],
+    networkId: '5',
     networkDetails: {
       EIPS: {},
     },
diff --git a/ui/selectors/confirm-transaction.test.js b/ui/selectors/confirm-transaction.test.js
index b44197020..86a551aae 100644
--- a/ui/selectors/confirm-transaction.test.js
+++ b/ui/selectors/confirm-transaction.test.js
@@ -31,7 +31,7 @@ describe('Confirm Transaction Selector', () => {
         unapprovedMsgCount: 1,
         unapprovedPersonalMsgCount: 1,
         unapprovedTypedMessagesCount: 1,
-        network: '5',
+        networkId: '5',
         provider: {
           chainId: '0x5',
         },
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 21db5560f..be2ced685 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -24,6 +24,7 @@ import {
   CHAIN_ID_TO_RPC_URL_MAP,
   CHAIN_IDS,
   NETWORK_TYPES,
+  NetworkStatus,
 } from '../../shared/constants/network';
 import {
   WebHIDConnectedStatuses,
@@ -77,16 +78,13 @@ import { getPermissionSubjects } from './permissions';
 ///: END:ONLY_INCLUDE_IN
 
 /**
- * One of the only remaining valid uses of selecting the network subkey of the
- * metamask state tree is to determine if the network is currently 'loading'.
+ * Returns true if the currently selected network is inaccessible or whether no
+ * provider has been set yet for the currently selected network.
  *
- * This will be used for all cases where this state key is accessed only for that
- * purpose.
- *
- * @param {object} state - redux state object
+ * @param {object} state - Redux state object.
  */
 export function isNetworkLoading(state) {
-  return state.metamask.network === 'loading';
+  return state.metamask.networkStatus !== NetworkStatus.Available;
 }
 
 export function getNetworkIdentifier(state) {
@@ -248,7 +246,7 @@ export function getAccountType(state) {
  * @param {object} state - redux state object
  */
 export function deprecatedGetCurrentNetworkId(state) {
-  return state.metamask.network;
+  return state.metamask.networkId ?? 'loading';
 }
 
 export const getMetaMaskAccounts = createSelector(
diff --git a/ui/selectors/transactions.js b/ui/selectors/transactions.js
index 684541327..5e95e8d6f 100644
--- a/ui/selectors/transactions.js
+++ b/ui/selectors/transactions.js
@@ -29,14 +29,14 @@ export const incomingTxListSelector = (state) => {
   }
 
   const {
-    network,
+    networkId,
     provider: { chainId },
   } = state.metamask;
   const selectedAddress = getSelectedAddress(state);
   return Object.values(state.metamask.incomingTransactions).filter(
     (tx) =>
       tx.txParams.to === selectedAddress &&
-      transactionMatchesNetwork(tx, chainId, network),
+      transactionMatchesNetwork(tx, chainId, networkId),
   );
 };
 export const unapprovedMsgsSelector = (state) => state.metamask.unapprovedMsgs;
diff --git a/ui/store/store.ts b/ui/store/store.ts
index 9d4a62a33..a4e9aa9d6 100644
--- a/ui/store/store.ts
+++ b/ui/store/store.ts
@@ -6,6 +6,7 @@ import { GasEstimateType, GasFeeEstimates } from '@metamask/gas-fee-controller';
 import rootReducer from '../ducks';
 import { LedgerTransportTypes } from '../../shared/constants/hardware-wallets';
 import { TransactionMeta } from '../../shared/constants/transaction';
+import type { NetworkStatus } from '../../shared/constants/network';
 
 /**
  * This interface is temporary and is copied from the message-manager.js file
@@ -65,7 +66,8 @@ interface TemporaryBackgroundState {
   unapprovedMsgs: MessagesIndexedById;
   unapprovedPersonalMsgs: MessagesIndexedById;
   unapprovedTypedMessages: MessagesIndexedById;
-  network: string;
+  networkId: string | null;
+  networkStatus: NetworkStatus;
   pendingApprovals: ApprovalControllerState['pendingApprovals'];
   knownMethodData?: {
     [fourBytePrefix: string]: Record<string, unknown>;

From 00e6471d90f02b01917cd1263daf761890113fef Mon Sep 17 00:00:00 2001
From: Thomas Huang <tmashuang@users.noreply.github.com>
Date: Fri, 31 Mar 2023 10:27:36 +0800
Subject: [PATCH 103/129] IPFS unit test for onboarding privacy setting
 (#18252)

---
 .../privacy-settings/privacy-settings.js      |  1 +
 .../privacy-settings/privacy-settings.test.js | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index ed06fd55b..3c23c51b8 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -246,6 +246,7 @@ export default function PrivacySettings() {
                 <Box paddingTop={2}>
                   <TextField
                     style={{ width: '100%' }}
+                    inputProps={{ 'data-testid': 'ipfs-input' }}
                     onChange={(e) => {
                       handleIPFSChange(e.target.value);
                     }}
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js
index f91f1409d..1c8d8e29c 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.test.js
@@ -23,6 +23,7 @@ describe('Privacy Settings Onboarding View', () => {
   const setUsePhishDetectStub = jest.fn();
   const setUseTokenDetectionStub = jest.fn();
   const setUseCurrencyRateCheckStub = jest.fn();
+  const setIpfsGatewayStub = jest.fn();
   const completeOnboardingStub = jest
     .fn()
     .mockImplementation(() => Promise.resolve());
@@ -33,6 +34,7 @@ describe('Privacy Settings Onboarding View', () => {
     setUsePhishDetect: setUsePhishDetectStub,
     setUseTokenDetection: setUseTokenDetectionStub,
     setUseCurrencyRateCheck: setUseCurrencyRateCheckStub,
+    setIpfsGateway: setIpfsGatewayStub,
     completeOnboarding: completeOnboardingStub,
     setUseMultiAccountBalanceChecker: setUseMultiAccountBalanceCheckerStub,
   });
@@ -95,4 +97,70 @@ describe('Privacy Settings Onboarding View', () => {
     );
     expect(setUseCurrencyRateCheckStub.mock.calls[1][0]).toStrictEqual(true);
   });
+
+  describe('IPFS', () => {
+    it('should handle proper IPFS input', () => {
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <PrivacySettings />,
+        store,
+      );
+
+      const ipfsInput = queryByTestId('ipfs-input');
+      const ipfsEvent = {
+        target: {
+          value: 'ipfs.io',
+        },
+      };
+
+      fireEvent.change(ipfsInput, ipfsEvent);
+
+      const validIpfsUrl = queryByText('IPFS gateway URL is valid');
+      expect(validIpfsUrl).toBeInTheDocument();
+
+      const submitButton = queryByText('Done');
+      fireEvent.click(submitButton);
+
+      expect(setIpfsGatewayStub).toHaveBeenCalled();
+    });
+
+    it('should error with gateway.ipfs.io IPFS input', () => {
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <PrivacySettings />,
+        store,
+      );
+
+      const ipfsInput = queryByTestId('ipfs-input');
+      const ipfsEvent = {
+        target: {
+          value: 'gateway.ipfs.io',
+        },
+      };
+
+      fireEvent.change(ipfsInput, ipfsEvent);
+
+      const invalidErrorMsg = queryByText('Please enter a valid URL');
+
+      expect(invalidErrorMsg).toBeInTheDocument();
+    });
+
+    it('should error with improper IPFS input', () => {
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <PrivacySettings />,
+        store,
+      );
+
+      const ipfsInput = queryByTestId('ipfs-input');
+      const ipfsEvent = {
+        target: {
+          value: ' ',
+        },
+      };
+
+      fireEvent.change(ipfsInput, ipfsEvent);
+
+      const invalidErrorMsg = queryByText('Please enter a valid URL');
+
+      expect(invalidErrorMsg).toBeInTheDocument();
+    });
+  });
 });

From 26fed9e8dab3956cb9804201db9c766a0eeb3ef6 Mon Sep 17 00:00:00 2001
From: Danica Shen <zhaodanica@gmail.com>
Date: Fri, 31 Mar 2023 11:00:44 +0200
Subject: [PATCH 104/129] =?UTF-8?q?fix(18194):=20Redirect=20to=20extension?=
 =?UTF-8?q?=20expanded=20view=20when=20click=20back=20to=20sa=E2=80=A6=20(?=
 =?UTF-8?q?#18376)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(18194): Redirect to extension expanded view when click back to safety button

* Bump phishing warning version

---------

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 app/scripts/metamask-controller.js        | 11 +++++-
 app/scripts/platforms/extension.js        | 25 +++++++++++---
 app/scripts/platforms/extension.test.js   | 30 ++++++++++++++++
 package.json                              |  2 +-
 test/e2e/tests/phishing-detection.spec.js | 42 +++++++++++++++++++++++
 yarn.lock                                 | 10 +++---
 6 files changed, 108 insertions(+), 12 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d4fff36bb..426fc9058 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3581,7 +3581,11 @@ export default class MetamaskController extends EventEmitter {
     phishingStream.on(
       'data',
       createMetaRPCHandler(
-        { safelistPhishingDomain: this.safelistPhishingDomain.bind(this) },
+        {
+          safelistPhishingDomain: this.safelistPhishingDomain.bind(this),
+          backToSafetyPhishingWarning:
+            this.backToSafetyPhishingWarning.bind(this),
+        },
         phishingStream,
       ),
     );
@@ -4342,6 +4346,11 @@ export default class MetamaskController extends EventEmitter {
     return this.phishingController.bypass(hostname);
   }
 
+  async backToSafetyPhishingWarning() {
+    const extensionURL = this.platform.getExtensionURL();
+    await this.platform.switchToAnotherURL(undefined, extensionURL);
+  }
+
   /**
    * Locks MetaMask
    */
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index 098c69efd..1ac0c853e 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -77,11 +77,7 @@ export default class ExtensionPlatform {
     return version;
   }
 
-  openExtensionInBrowser(
-    route = null,
-    queryString = null,
-    keepWindowOpen = false,
-  ) {
+  getExtensionURL(route = null, queryString = null) {
     let extensionURL = browser.runtime.getURL('home.html');
 
     if (route) {
@@ -92,7 +88,22 @@ export default class ExtensionPlatform {
       extensionURL += `?${queryString}`;
     }
 
+    return extensionURL;
+  }
+
+  openExtensionInBrowser(
+    route = null,
+    queryString = null,
+    keepWindowOpen = false,
+  ) {
+    const extensionURL = this.getExtensionURL(
+      route,
+      queryString,
+      keepWindowOpen,
+    );
+
     this.openTab({ url: extensionURL });
+
     if (
       getEnvironmentType() !== ENVIRONMENT_TYPE_BACKGROUND &&
       !keepWindowOpen
@@ -153,6 +164,10 @@ export default class ExtensionPlatform {
     return tab;
   }
 
+  async switchToAnotherURL(tabId, url) {
+    await browser.tabs.update(tabId, { url });
+  }
+
   async closeTab(tabId) {
     await browser.tabs.remove(tabId);
   }
diff --git a/app/scripts/platforms/extension.test.js b/app/scripts/platforms/extension.test.js
index 1b2067d78..27cc0e8b9 100644
--- a/app/scripts/platforms/extension.test.js
+++ b/app/scripts/platforms/extension.test.js
@@ -1,10 +1,14 @@
 import browser from 'webextension-polyfill';
 import ExtensionPlatform from './extension';
 
+const TEST_URL =
+  'chrome-extension://jjlgkphpeekojaidfeknpknnimdbleaf/home.html';
+
 jest.mock('webextension-polyfill', () => {
   return {
     runtime: {
       getManifest: jest.fn(),
+      getURL: jest.fn(),
     },
   };
 });
@@ -91,4 +95,30 @@ describe('extension platform', () => {
       );
     });
   });
+
+  describe('getExtensionURL', () => {
+    let extensionPlatform;
+    beforeEach(() => {
+      browser.runtime.getURL.mockReturnValue(TEST_URL);
+      extensionPlatform = new ExtensionPlatform();
+    });
+
+    it('should return URL itself if no route or queryString is provided', () => {
+      expect(extensionPlatform.getExtensionURL()).toStrictEqual(TEST_URL);
+    });
+
+    it('should return URL with route when provided', () => {
+      const TEST_ROUTE = 'test-route';
+      expect(extensionPlatform.getExtensionURL(TEST_ROUTE)).toStrictEqual(
+        `${TEST_URL}#${TEST_ROUTE}`,
+      );
+    });
+
+    it('should return URL with queryString when provided', () => {
+      const QUERY_STRING = 'name=ferret';
+      expect(
+        extensionPlatform.getExtensionURL(null, QUERY_STRING),
+      ).toStrictEqual(`${TEST_URL}?${QUERY_STRING}`);
+    });
+  });
 });
diff --git a/package.json b/package.json
index b0cdf96a7..c7aa8f8ed 100644
--- a/package.json
+++ b/package.json
@@ -375,7 +375,7 @@
     "@metamask/eslint-config-nodejs": "^9.0.0",
     "@metamask/eslint-config-typescript": "^9.0.1",
     "@metamask/forwarder": "^1.1.0",
-    "@metamask/phishing-warning": "^2.0.1",
+    "@metamask/phishing-warning": "^2.1.0",
     "@metamask/test-dapp": "^5.6.0",
     "@sentry/cli": "^1.58.0",
     "@storybook/addon-a11y": "^6.5.13",
diff --git a/test/e2e/tests/phishing-detection.spec.js b/test/e2e/tests/phishing-detection.spec.js
index cc30a5ca0..c82645e1f 100644
--- a/test/e2e/tests/phishing-detection.spec.js
+++ b/test/e2e/tests/phishing-detection.spec.js
@@ -289,4 +289,46 @@ describe('Phishing Detection', function () {
       },
     );
   });
+
+  it('should open a new extension expanded view when clicking back to safety button', async function () {
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().build(),
+        ganacheOptions,
+        title: this.test.title,
+        testSpecificMock: mockPhishingDetection,
+        dapp: true,
+        dappPaths: ['mock-page-with-disallowed-iframe'],
+        dappOptions: {
+          numberOfDapps: 2,
+        },
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+        await driver.openNewPage(
+          `http://localhost:8080?extensionUrl=${driver.extensionUrl}`,
+        );
+
+        const iframe = await driver.findElement('iframe');
+
+        await driver.switchToFrame(iframe);
+        await driver.clickElement({
+          text: 'Open this warning in a new tab',
+        });
+        await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
+        await driver.clickElement({
+          text: 'Back to safety',
+        });
+
+        // Ensure we're redirected to wallet home page
+        const homePage = await driver.findElement('.home__main-view');
+        const homePageDisplayed = await homePage.isDisplayed();
+
+        assert.equal(homePageDisplayed, true);
+      },
+    );
+  });
 });
diff --git a/yarn.lock b/yarn.lock
index e1de27f68..5f398c68d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4204,9 +4204,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/phishing-warning@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@metamask/phishing-warning@npm:2.0.1"
+"@metamask/phishing-warning@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@metamask/phishing-warning@npm:2.1.0"
   dependencies:
     "@metamask/design-tokens": ^1.6.0
     "@metamask/post-message-stream": ^6.0.0
@@ -4217,7 +4217,7 @@ __metadata:
     pump: ^3.0.0
     punycode: ^2.1.1
     ses: ^0.18.1
-  checksum: caa3e596c3a67188e457307b43724c89121d60734353922d369932093f8618f96465ba7613b194dc2c57754399783dcdf1777c900afeff21bd5137f02688b686
+  checksum: d04b3f817deafa077028f2d235ae694fa772a5ee6a02fc73c6f1fed6dbd1a7491370a25b9484157835f9e1a1773e738a1306ce0c854604eba99af86f1624f453
   languageName: node
   linkType: hard
 
@@ -24292,7 +24292,7 @@ __metadata:
     "@metamask/obs-store": ^5.0.0
     "@metamask/permission-controller": ^3.1.0
     "@metamask/phishing-controller": ^2.0.0
-    "@metamask/phishing-warning": ^2.0.1
+    "@metamask/phishing-warning": ^2.1.0
     "@metamask/post-message-stream": ^6.0.0
     "@metamask/providers": ^10.2.1
     "@metamask/rate-limit-controller": ^1.0.0

From e895ff33f994a0252a44b03d8807a099ad0205fe Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 31 Mar 2023 04:11:07 -0500
Subject: [PATCH 105/129] NFTs: Use Unknown Collection instead of first NFT
 name (#18388)

* NFTs: Use Unknown Collection instead of first NFT name

* Use localization in hook

* Get localization for previously owned

* Fix tests

---------

Co-authored-by: Dan Miller <danjm.com@gmail.com>
---
 app/_locales/en/messages.json       |  3 +++
 test/e2e/nft/import-erc1155.spec.js |  2 +-
 ui/hooks/useNftsCollections.js      | 12 +++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 82873ab64..882de250d 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -2309,6 +2309,9 @@
   "nfts": {
     "message": "NFTs"
   },
+  "nftsPreviouslyOwned": {
+    "message": "Previously Owned"
+  },
   "nickname": {
     "message": "Nickname"
   },
diff --git a/test/e2e/nft/import-erc1155.spec.js b/test/e2e/nft/import-erc1155.spec.js
index 9be71fd05..95992d770 100644
--- a/test/e2e/nft/import-erc1155.spec.js
+++ b/test/e2e/nft/import-erc1155.spec.js
@@ -51,7 +51,7 @@ describe('Import ERC1155 NFT', function () {
         // Check the imported ERC1155 and its image are displayed in the ERC1155 tab
         const importedERC1155 = await driver.waitForSelector({
           css: 'h5',
-          text: 'Rocks',
+          text: 'Unnamed collection',
         });
         assert.equal(await importedERC1155.isDisplayed(), true);
 
diff --git a/ui/hooks/useNftsCollections.js b/ui/hooks/useNftsCollections.js
index d6b7251b7..17d639a15 100644
--- a/ui/hooks/useNftsCollections.js
+++ b/ui/hooks/useNftsCollections.js
@@ -4,11 +4,16 @@ import { isEqual } from 'lodash';
 import { getNfts, getNftContracts } from '../ducks/metamask/metamask';
 import { getCurrentChainId, getSelectedAddress } from '../selectors';
 import { usePrevious } from './usePrevious';
+import { useI18nContext } from './useI18nContext';
 
 export function useNftsCollections() {
+  const t = useI18nContext();
+  const previouslyOwnedText = t('nftsPreviouslyOwned');
+  const unknownCollectionText = t('unknownCollection');
+
   const [collections, setCollections] = useState({});
   const [previouslyOwnedCollection, setPreviouslyOwnedCollection] = useState({
-    collectionName: 'Previously Owned',
+    collectionName: previouslyOwnedText,
     nfts: [],
   });
   const nfts = useSelector(getNfts);
@@ -19,6 +24,7 @@ export function useNftsCollections() {
   const prevNfts = usePrevious(nfts);
   const prevChainId = usePrevious(chainId);
   const prevSelectedAddress = usePrevious(selectedAddress);
+
   useEffect(() => {
     const getCollections = () => {
       setNftsLoading(true);
@@ -27,7 +33,7 @@ export function useNftsCollections() {
       }
       const newCollections = {};
       const newPreviouslyOwnedCollections = {
-        collectionName: 'Previously Owned',
+        collectionName: previouslyOwnedText,
         nfts: [],
       };
 
@@ -41,7 +47,7 @@ export function useNftsCollections() {
             ({ address }) => address === nft.address,
           );
           newCollections[nft.address] = {
-            collectionName: collectionContract?.name || nft.name,
+            collectionName: collectionContract?.name || unknownCollectionText,
             collectionImage: collectionContract?.logo || nft.image,
             nfts: [nft],
           };

From 234fb4ac5db5ad588739dd6e12038b40a2889716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Fri, 31 Mar 2023 10:30:10 +0100
Subject: [PATCH 106/129] [MMI] confirm-add-custodian-token component (#18261)

* adds component with locales and test

* adds feedback from review

* adds storeis file

* update snapshots

* prettier

* clean up stories file

* relocation

* review fixes

* Update ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js

Co-authored-by: George Marshall <george.marshall@consensys.net>

* Update ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js

Co-authored-by: George Marshall <george.marshall@consensys.net>

* Update ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js

Co-authored-by: George Marshall <george.marshall@consensys.net>

* Button path remove

* Update ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js

Co-authored-by: George Marshall <george.marshall@consensys.net>

* pulled

* stories file update location

---------

Co-authored-by: George Marshall <george.marshall@consensys.net>
---
 app/_locales/en/messages.json                 |  15 +
 .../__snapshots__/jwt-url-form.test.js.snap   |  10 +-
 .../jwt-url-form/jwt-url-form.js              |  25 +-
 .../jwt-url-form/jwt-url-form.scss            |  28 --
 .../jwt-url-form/jwt-url-form.test.js         |  17 +-
 ui/helpers/constants/routes.ts                |   6 +
 .../confirm-add-custodian-token.js            | 268 ++++++++++++++++++
 .../confirm-add-custodian-token.stories.js    |  43 +++
 .../confirm-add-custodian-token.test.js       | 126 ++++++++
 .../confirm-add-custodian-token/index.js      |   1 +
 .../confirm-add-custodian-token/index.scss    |   8 +
 11 files changed, 501 insertions(+), 46 deletions(-)
 create mode 100644 ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js
 create mode 100644 ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.stories.js
 create mode 100644 ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.test.js
 create mode 100644 ui/pages/institutional/confirm-add-custodian-token/index.js
 create mode 100644 ui/pages/institutional/confirm-add-custodian-token/index.scss

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 882de250d..c9669541e 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -103,6 +103,9 @@
   "SIWEWarningTitle": {
     "message": "Are you sure?"
   },
+  "ShowMore": {
+    "message": "Show more"
+  },
   "about": {
     "message": "About"
   },
@@ -348,6 +351,9 @@
   "amount": {
     "message": "Amount"
   },
+  "apiUrl": {
+    "message": "API URL"
+  },
   "appDescription": {
     "message": "An Ethereum Wallet in your Browser",
     "description": "The description of the application"
@@ -908,6 +914,12 @@
   "curveMediumGasEstimate": {
     "message": "Market gas estimate graph"
   },
+  "custodian": {
+    "message": "Custodian"
+  },
+  "custodianAccount": {
+    "message": "Custodian account"
+  },
   "custom": {
     "message": "Advanced"
   },
@@ -2118,6 +2130,9 @@
   "missingToken": {
     "message": "Don't see your token?"
   },
+  "mmiAddToken": {
+    "message": "The page at $1 would like to authorise the following custodian token in MetaMask Institutional"
+  },
   "mobileSyncWarning": {
     "message": "The 'Sync with extension' feature is temporarily disabled. If you want to use your extension wallet on MetaMask mobile, then on your mobile app: go back to the wallet setup options and select the 'Import with Secret Recovery Phrase' option. Use your extension wallet's secret phrase to then import your wallet into mobile."
   },
diff --git a/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap b/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap
index 6c15c0327..cdf419d89 100644
--- a/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap
+++ b/ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap
@@ -3,16 +3,16 @@
 exports[`JwtUrlForm shows JWT text area when no jwt token exists 1`] = `
 <div>
   <div
-    class="box jwt-url-form box--margin-bottom-8 box--display-flex box--flex-direction-row box--align-items-flex-start"
+    class="box jwt-url-form box--margin-bottom-8 box--display-flex box--flex-direction-column box--align-items-flex-start"
   >
     <div
-      class="box jwt-url-form__jwt-container box--margin-bottom-6 box--flex-direction-row"
+      class="box jwt-url-form__jwt-container box--margin-top-4 box--margin-bottom-6 box--display-flex box--flex-direction-column box--align-items-center box--width-full"
     >
       <div
         class="box box--flex-direction-row"
       >
         <p
-          class="box mm-text jwt-url-form__instruction mm-text--body-md box--flex-direction-row box--color-text-default"
+          class="box mm-text jwt-url-form__instruction mm-text--body-md box--display-block box--flex-direction-row box--color-text-default"
         >
           input text
         </p>
@@ -25,10 +25,10 @@ exports[`JwtUrlForm shows JWT text area when no jwt token exists 1`] = `
       </div>
     </div>
     <div
-      class="box jwt-url-form__jwt-apiUrlInput box--flex-direction-row"
+      class="box box--flex-direction-row box--width-full"
     >
       <p
-        class="box mm-text jwt-url-form__instruction mm-text--body-md box--flex-direction-row box--color-text-default"
+        class="box mm-text jwt-url-form__instruction mm-text--body-md box--display-block box--flex-direction-row box--color-text-default"
       />
       <div
         class="box box--flex-direction-row"
diff --git a/ui/components/institutional/jwt-url-form/jwt-url-form.js b/ui/components/institutional/jwt-url-form/jwt-url-form.js
index c1c9f3edf..1f7aedbfc 100644
--- a/ui/components/institutional/jwt-url-form/jwt-url-form.js
+++ b/ui/components/institutional/jwt-url-form/jwt-url-form.js
@@ -5,6 +5,8 @@ import {
   AlignItems,
   DISPLAY,
   BorderColor,
+  BLOCK_SIZES,
+  FLEX_DIRECTION,
 } from '../../../helpers/constants/design-system';
 import { Text } from '../../component-library';
 import JwtDropdown from '../jwt-dropdown';
@@ -22,7 +24,15 @@ const JwtUrlForm = (props) => {
     const showJwtDropdown = props.jwtList.length >= 1;
 
     return (
-      <Box className="jwt-url-form__jwt-container" marginBottom={6}>
+      <Box
+        width={BLOCK_SIZES.FULL}
+        display={DISPLAY.FLEX}
+        flexDirection={FLEX_DIRECTION.COLUMN}
+        marginTop={4}
+        alignItems={AlignItems.center}
+        className="jwt-url-form__jwt-container"
+        marginBottom={6}
+      >
         {showJwtDropdown && (
           <JwtDropdown
             data-testid="jwt-dropdown"
@@ -36,13 +46,15 @@ const JwtUrlForm = (props) => {
         )}
         {showJwtDropdown && !showAddNewToken && (
           <Box
-            className="jwt-url-form__btn__container"
+            width={BLOCK_SIZES.FULL}
             display={DISPLAY.FLEX}
+            flexDirection={FLEX_DIRECTION.COLUMN}
             alignItems={AlignItems.center}
             marginTop={2}
           >
             <Text>{t('or')}</Text>
             <Button
+              data-testid="addNewToken-btn"
               type="secondary"
               medium="true"
               onClick={() => {
@@ -56,7 +68,7 @@ const JwtUrlForm = (props) => {
         )}
         {(!showJwtDropdown || showAddNewToken) && (
           <Box>
-            <Text className="jwt-url-form__instruction">
+            <Text className="jwt-url-form__instruction" display={DISPLAY.BLOCK}>
               {props.jwtInputText}
             </Text>
             {fileTooBigError && (
@@ -85,8 +97,10 @@ const JwtUrlForm = (props) => {
 
   const renderAPIURLInput = () => {
     return (
-      <Box className="jwt-url-form__jwt-apiUrlInput">
-        <Text className="jwt-url-form__instruction">{props.urlInputText}</Text>
+      <Box width={BLOCK_SIZES.FULL}>
+        <Text className="jwt-url-form__instruction" display={DISPLAY.BLOCK}>
+          {props.urlInputText}
+        </Text>
         <Box>
           <input
             className="jwt-url-form__input"
@@ -106,6 +120,7 @@ const JwtUrlForm = (props) => {
     <Box
       className="jwt-url-form"
       display={DISPLAY.FLEX}
+      flexDirection={FLEX_DIRECTION.COLUMN}
       alignItems={AlignItems.flexStart}
       marginBottom={8}
     >
diff --git a/ui/components/institutional/jwt-url-form/jwt-url-form.scss b/ui/components/institutional/jwt-url-form/jwt-url-form.scss
index cb235473d..fcc17b14d 100644
--- a/ui/components/institutional/jwt-url-form/jwt-url-form.scss
+++ b/ui/components/institutional/jwt-url-form/jwt-url-form.scss
@@ -1,28 +1,8 @@
 .jwt-url-form {
-  flex-flow: column;
-
-  &__jwt-container {
-    width: 100%;
-  }
-
-  &__jwt-apiUrlInput {
-    width: 100%;
-  }
-
-  &__btn__container {
-    flex-flow: column;
-    width: 100%;
-
-    & > span {
-      padding-bottom: 10px;
-    }
-  }
-
   &__instruction {
     @include Paragraph;
 
     align-self: flex-start;
-    display: block;
     font-size: 14px;
   }
 
@@ -37,14 +17,6 @@
     padding: 0 10px;
   }
 
-  &__input-jwt-container {
-    display: flex;
-    flex-flow: column;
-    align-items: center;
-    width: 100%;
-    margin-top: 16px;
-  }
-
   &__input-jwt {
     @include Paragraph;
 
diff --git a/ui/components/institutional/jwt-url-form/jwt-url-form.test.js b/ui/components/institutional/jwt-url-form/jwt-url-form.test.js
index 5452b9fd9..14a54ecbc 100644
--- a/ui/components/institutional/jwt-url-form/jwt-url-form.test.js
+++ b/ui/components/institutional/jwt-url-form/jwt-url-form.test.js
@@ -27,24 +27,25 @@ describe('JwtUrlForm', function () {
   };
 
   it('opens JWT Url Form without input for new JWT', () => {
-    const { container, getByText } = renderWithProvider(
+    const { getAllByTestId, getByText } = renderWithProvider(
       <JwtUrlForm {...props} />,
       store,
     );
 
-    const btn = container.querySelector(
-      '.jwt-url-form__btn__container .btn-secondary',
+    expect(getAllByTestId('addNewToken-btn')[0]).toHaveAttribute(
+      'role',
+      'button',
     );
-    expect(btn).toHaveClass('button');
     expect(getByText('Add new token')).toBeInTheDocument();
   });
 
   it('shows JWT textarea with provided input text', () => {
-    const { container } = renderWithProvider(<JwtUrlForm {...props} />, store);
-
-    const btn = container.querySelector(
-      '.jwt-url-form__btn__container .btn-secondary',
+    const { getAllByTestId } = renderWithProvider(
+      <JwtUrlForm {...props} />,
+      store,
     );
+
+    const btn = getAllByTestId('addNewToken-btn')[0];
     fireEvent.click(btn);
     expect(screen.getByText('input text')).toBeInTheDocument();
   });
diff --git a/ui/helpers/constants/routes.ts b/ui/helpers/constants/routes.ts
index 8b206ed6d..f448f07bc 100644
--- a/ui/helpers/constants/routes.ts
+++ b/ui/helpers/constants/routes.ts
@@ -20,6 +20,9 @@ const CONTACT_LIST_ROUTE = '/settings/contact-list';
 const CONTACT_EDIT_ROUTE = '/settings/contact-list/edit-contact';
 const CONTACT_ADD_ROUTE = '/settings/contact-list/add-contact';
 const CONTACT_VIEW_ROUTE = '/settings/contact-list/view-contact';
+///: BEGIN:ONLY_INCLUDE_IN(mmi)
+const CUSTODY_ACCOUNT_ROUTE = '/new-account/custody';
+///: END:ONLY_INCLUDE_IN
 const REVEAL_SEED_ROUTE = '/seed';
 const MOBILE_SYNC_ROUTE = '/mobile-sync';
 const RESTORE_VAULT_ROUTE = '/restore-vault';
@@ -203,6 +206,9 @@ export {
   CONTACT_EDIT_ROUTE,
   CONTACT_ADD_ROUTE,
   CONTACT_VIEW_ROUTE,
+  ///: BEGIN:ONLY_INCLUDE_IN(mmi)
+  CUSTODY_ACCOUNT_ROUTE,
+  ///: END:ONLY_INCLUDE_IN
   NETWORKS_ROUTE,
   NETWORKS_FORM_ROUTE,
   ADD_NETWORK_ROUTE,
diff --git a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js
new file mode 100644
index 000000000..3046ab54d
--- /dev/null
+++ b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.js
@@ -0,0 +1,268 @@
+import React, { useContext, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import PulseLoader from '../../../components/ui/pulse-loader';
+import { CUSTODY_ACCOUNT_ROUTE } from '../../../helpers/constants/routes';
+import {
+  AlignItems,
+  DISPLAY,
+  TextColor,
+  TEXT_ALIGN,
+  FLEX_DIRECTION,
+} from '../../../helpers/constants/design-system';
+import { BUILT_IN_NETWORKS } from '../../../../shared/constants/network';
+import { I18nContext } from '../../../contexts/i18n';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { getMostRecentOverviewPage } from '../../../ducks/history/history';
+import { setProviderType } from '../../../store/actions';
+import { mmiActionsFactory } from '../../../store/institutional/institution-background';
+import {
+  Label,
+  Text,
+  ButtonLink,
+  Button,
+  BUTTON_SIZES,
+  BUTTON_TYPES,
+} from '../../../components/component-library';
+import Box from '../../../components/ui/box';
+
+const ConfirmAddCustodianToken = () => {
+  const t = useContext(I18nContext);
+  const dispatch = useDispatch();
+  const history = useHistory();
+  const trackEvent = useContext(MetaMetricsContext);
+  const mmiActions = mmiActionsFactory();
+
+  const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
+  const connectRequests = useSelector(
+    (state) => state.metamask.institutionalFeatures?.connectRequests,
+  );
+  const complianceActivated = useSelector((state) =>
+    Boolean(state.metamask.institutionalFeatures?.complianceProjectId),
+  );
+  const [showMore, setShowMore] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const [connectError, setConnectError] = useState('');
+
+  const handleConnectError = (e) => {
+    let errorMessage = e.message;
+
+    if (!errorMessage) {
+      errorMessage = 'Connection error';
+    }
+
+    setConnectError(errorMessage);
+    setIsLoading(false);
+  };
+
+  const renderSelectedToken = () => {
+    const connectRequest = connectRequests ? connectRequests[0] : undefined;
+
+    return (
+      <Box
+        paddingTop={2}
+        paddingBottom={2}
+        display={DISPLAY.FLEX}
+        flexDirection={FLEX_DIRECTION.ROW}
+        alignItems={AlignItems.center}
+      >
+        <Text>
+          {showMore && connectRequest?.token
+            ? connectRequest?.token
+            : `...${connectRequest?.token.slice(-9)}`}
+        </Text>
+        {!showMore && (
+          <Box paddingLeft={2}>
+            <ButtonLink
+              rel="noopener noreferrer"
+              onClick={() => {
+                setShowMore(true);
+              }}
+            >
+              {t('ShowMore')}
+            </ButtonLink>
+          </Box>
+        )}
+      </Box>
+    );
+  };
+
+  const connectRequest = connectRequests ? connectRequests[0] : undefined;
+
+  if (!connectRequest) {
+    history.push(mostRecentOverviewPage);
+    return null;
+  }
+
+  trackEvent({
+    category: 'MMI',
+    event: 'Custodian onboarding',
+    properties: {
+      actions: 'Custodian RPC request',
+      custodian: connectRequest.custodian,
+      apiUrl: connectRequest.apiUrl,
+    },
+  });
+
+  let custodianLabel = '';
+
+  if (
+    connectRequest.labels &&
+    connectRequest.labels.some((label) => label.key === 'service')
+  ) {
+    custodianLabel = connectRequest.labels.find(
+      (label) => label.key === 'service',
+    ).value;
+  }
+
+  return (
+    <Box className="page-container">
+      <Box className="page-container__header">
+        <Text className="page-container__title">{t('custodianAccount')}</Text>
+        <Text className="page-container__subtitle">
+          {t('mmiAddToken', [connectRequest.origin])}
+        </Text>
+      </Box>
+      <Box padding={4} className="page-container__content">
+        {custodianLabel && (
+          <>
+            <Text padding={4} color={TextColor.textDefault}>
+              {t('custodian')}
+            </Text>
+            <Label
+              marginRight={4}
+              marginLeft={4}
+              color={TextColor.textAlternative}
+              className="add_custodian_token_confirm__url"
+            >
+              {custodianLabel}
+            </Label>
+          </>
+        )}
+
+        <Text padding={4} color={TextColor.textDefault}>
+          {t('token')}
+        </Text>
+        <Box
+          marginRight={4}
+          marginLeft={4}
+          className="add_custodian_token_confirm__token"
+        >
+          {renderSelectedToken()}
+        </Box>
+        {connectRequest.apiUrl && (
+          <Box>
+            <Text padding={4} color={TextColor.textDefault}>
+              {t('apiUrl')}
+            </Text>
+            <Text
+              marginRight={4}
+              marginLeft={4}
+              color={TextColor.textAlternative}
+              fontSize="14"
+              className="add_custodian_token_confirm__url"
+            >
+              {connectRequest.apiUrl}
+            </Text>
+          </Box>
+        )}
+      </Box>
+
+      {!complianceActivated && (
+        <Box marginTop={4} data-testid="connect-custodian-token-error">
+          <Text data-testid="error-message" textAlign={TEXT_ALIGN.CENTER}>
+            {connectError}
+          </Text>
+        </Box>
+      )}
+
+      <Box as="footer" className="page-container__footer" padding={4}>
+        {isLoading ? (
+          <PulseLoader />
+        ) : (
+          <Box display={DISPLAY.FLEX} gap={4}>
+            <Button
+              block
+              type={BUTTON_TYPES.SECONDARY}
+              size={BUTTON_SIZES.LG}
+              data-testid="cancel-btn"
+              onClick={() => {
+                mmiActions.removeAddTokenConnectRequest({
+                  origin: connectRequest.origin,
+                  apiUrl: connectRequest.apiUrl,
+                  token: connectRequest.token,
+                });
+                history.push(mostRecentOverviewPage);
+                trackEvent({
+                  category: 'MMI',
+                  event: 'Custodian onboarding',
+                  properties: {
+                    actions: 'Custodian RPC cancel',
+                    custodian: connectRequest.custodian,
+                    apiUrl: connectRequest.apiUrl,
+                  },
+                });
+              }}
+            >
+              {t('cancel')}
+            </Button>
+            <Button
+              block
+              data-testid="confirm-btn"
+              size={BUTTON_SIZES.LG}
+              onClick={async () => {
+                setConnectError('');
+                setIsLoading(true);
+
+                try {
+                  if (connectRequest.chainId) {
+                    const networkType = Object.keys(BUILT_IN_NETWORKS).find(
+                      (key) =>
+                        Number(BUILT_IN_NETWORKS[key].chainId).toString(10) ===
+                        connectRequest.chainId.toString(),
+                    );
+                    await dispatch(setProviderType(networkType));
+                  }
+
+                  let custodianName = connectRequest.service.toLowerCase();
+
+                  if (connectRequest.service === 'JSONRPC') {
+                    custodianName = connectRequest.environment;
+                  }
+
+                  await mmiActions.setCustodianConnectRequest({
+                    token: connectRequest.token,
+                    apiUrl: connectRequest.apiUrl,
+                    custodianName,
+                    custodianType: connectRequest.service,
+                  });
+                  mmiActions.removeAddTokenConnectRequest({
+                    origin: connectRequest.origin,
+                    apiUrl: connectRequest.apiUrl,
+                    token: connectRequest.token,
+                  });
+                  trackEvent({
+                    category: 'MMI',
+                    event: 'Custodian onboarding',
+                    properties: {
+                      actions: 'Custodian RPC confirm',
+                      custodian: connectRequest.custodian,
+                      apiUrl: connectRequest.apiUrl,
+                    },
+                  });
+                  history.push(CUSTODY_ACCOUNT_ROUTE);
+                } catch (e) {
+                  handleConnectError(e);
+                }
+              }}
+            >
+              {t('confirm')}
+            </Button>
+          </Box>
+        )}
+      </Box>
+    </Box>
+  );
+};
+
+export default ConfirmAddCustodianToken;
diff --git a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.stories.js b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.stories.js
new file mode 100644
index 000000000..01055b785
--- /dev/null
+++ b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.stories.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureStore from '../../../store/store';
+import testData from '../../../../.storybook/test-data';
+import ConfirmAddCustodianToken from '.';
+
+const customData = {
+  ...testData,
+  metamask: {
+    ...testData.metamask,
+    institutionalFeatures: {
+      complianceProjectId: '',
+      connectRequests: [
+        {
+          labels: [
+            {
+              key: 'service',
+              value: 'test',
+            },
+          ],
+          origin: 'origin',
+          token: 'awesomeTestToken',
+          feature: 'custodian',
+          service: 'Saturn',
+          apiUrl: 'https://www.apiurl.net/v1',
+          chainId: 1,
+        },
+      ],
+    },
+  },
+};
+
+const store = configureStore(customData);
+
+export default {
+  title: 'Pages/Institutional/ConfirmAddCustodianToken',
+  decorators: [(story) => <Provider store={store}>{story()}</Provider>],
+  component: ConfirmAddCustodianToken,
+};
+
+export const DefaultStory = () => <ConfirmAddCustodianToken />;
+
+DefaultStory.storyName = 'ConfirmAddCustodianToken';
diff --git a/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.test.js b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.test.js
new file mode 100644
index 000000000..37660c0da
--- /dev/null
+++ b/ui/pages/institutional/confirm-add-custodian-token/confirm-add-custodian-token.test.js
@@ -0,0 +1,126 @@
+import React from 'react';
+import { screen, fireEvent } from '@testing-library/react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import ConfirmAddCustodianToken from './confirm-add-custodian-token';
+
+describe('Confirm Add Custodian Token', () => {
+  const mockStore = {
+    metamask: {
+      provider: {
+        type: 'test',
+      },
+      preferences: {
+        useNativeCurrencyAsPrimaryCurrency: true,
+      },
+      institutionalFeatures: {
+        complianceProjectId: '',
+        connectRequests: [
+          {
+            labels: [
+              {
+                key: 'service',
+                value: 'test',
+              },
+            ],
+            origin: 'origin',
+            token: 'testToken',
+            feature: 'custodian',
+            service: 'Jupiter',
+            apiUrl: 'https://',
+            chainId: 1,
+          },
+        ],
+      },
+    },
+    history: {
+      push: '/',
+      mostRecentOverviewPage: '/',
+    },
+  };
+
+  const store = configureMockStore()(mockStore);
+
+  it('opens confirm add custodian token with correct token', () => {
+    renderWithProvider(<ConfirmAddCustodianToken />, store);
+
+    const tokenContainer = screen.getByText('...testToken');
+    expect(tokenContainer).toBeInTheDocument();
+  });
+
+  it('shows the custodian on cancel click', () => {
+    renderWithProvider(<ConfirmAddCustodianToken />, store);
+
+    const cancelButton = screen.getByTestId('cancel-btn');
+
+    fireEvent.click(cancelButton);
+
+    expect(screen.getByText('Custodian')).toBeInTheDocument();
+  });
+
+  it('tries to connect to custodian with empty token', async () => {
+    const customMockedStore = {
+      metamask: {
+        provider: {
+          type: 'test',
+        },
+        preferences: {
+          useNativeCurrencyAsPrimaryCurrency: true,
+        },
+        institutionalFeatures: {
+          complianceProjectId: '',
+          connectRequests: [
+            {
+              labels: [
+                {
+                  key: 'service',
+                  value: 'test',
+                },
+              ],
+              origin: 'origin',
+              token: '',
+              feature: 'custodian',
+              service: 'Jupiter',
+              apiUrl: 'https://',
+              chainId: 1,
+            },
+          ],
+        },
+      },
+      history: {
+        push: '/',
+        mostRecentOverviewPage: '/',
+      },
+    };
+
+    const customStore = configureMockStore()(customMockedStore);
+
+    renderWithProvider(<ConfirmAddCustodianToken />, customStore);
+
+    const confirmButton = screen.getByTestId('confirm-btn');
+    fireEvent.click(confirmButton);
+
+    const errorMessage = screen.getByTestId('connect-custodian-token-error');
+
+    expect(errorMessage).toBeVisible();
+  });
+
+  it('clicks the confirm button and shows the test value', async () => {
+    renderWithProvider(<ConfirmAddCustodianToken />, store);
+
+    const confirmButton = screen.getByTestId('confirm-btn');
+    fireEvent.click(confirmButton);
+
+    expect(screen.getByText('test')).toBeInTheDocument();
+  });
+
+  it('shows the error area', () => {
+    renderWithProvider(<ConfirmAddCustodianToken />, store);
+
+    const confirmButton = screen.getByTestId('confirm-btn');
+
+    fireEvent.click(confirmButton);
+
+    expect(screen.getByTestId('error-message')).toBeVisible();
+  });
+});
diff --git a/ui/pages/institutional/confirm-add-custodian-token/index.js b/ui/pages/institutional/confirm-add-custodian-token/index.js
new file mode 100644
index 000000000..39b01e55e
--- /dev/null
+++ b/ui/pages/institutional/confirm-add-custodian-token/index.js
@@ -0,0 +1 @@
+export { default } from './confirm-add-custodian-token';
diff --git a/ui/pages/institutional/confirm-add-custodian-token/index.scss b/ui/pages/institutional/confirm-add-custodian-token/index.scss
new file mode 100644
index 000000000..17845c049
--- /dev/null
+++ b/ui/pages/institutional/confirm-add-custodian-token/index.scss
@@ -0,0 +1,8 @@
+.add_custodian_token_confirm {
+  &__token,
+  &__url {
+    height: auto;
+    overflow-wrap: break-word;
+    opacity: 0.8;
+  }
+}

From c2618176f64cc985787ad2728e85a91e7b791e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Oliv=C3=A9?= <albertolivecorbella@gmail.com>
Date: Fri, 31 Mar 2023 13:23:11 +0200
Subject: [PATCH 107/129] [MMI] Added code fencing in info tab component
 (#17910)

* Added code fencing in info tab component

* Fixed storybook urls

* Removed isBeta mmi code fencing
---
 ui/helpers/constants/common.ts                |  4 +-
 .../settings/info-tab/info-tab.component.js   | 64 +++++++++++++++----
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/ui/helpers/constants/common.ts b/ui/helpers/constants/common.ts
index da6e58a34..62e8077b8 100644
--- a/ui/helpers/constants/common.ts
+++ b/ui/helpers/constants/common.ts
@@ -12,8 +12,8 @@ _supportRequestLink =
 
 ///: BEGIN:ONLY_INCLUDE_IN(mmi)
 _supportRequestLink = 'https://mmi-support.zendesk.com/hc/en-us/requests/new';
-const _mmiWebSite = 'https://metamask.io/institutions/';
-export const MMI_WEB_SITE = _mmiWebSite;
+export const SUPPORT_LINK = 'https://mmi-support.zendesk.com/hc/en-us';
+export const MMI_WEB_SITE = 'https://metamask.io/institutions/';
 ///: END:ONLY_INCLUDE_IN
 
 export const SUPPORT_REQUEST_LINK = _supportRequestLink;
diff --git a/ui/pages/settings/info-tab/info-tab.component.js b/ui/pages/settings/info-tab/info-tab.component.js
index 5c6e4b66e..8fef74d12 100644
--- a/ui/pages/settings/info-tab/info-tab.component.js
+++ b/ui/pages/settings/info-tab/info-tab.component.js
@@ -4,7 +4,12 @@ import PropTypes from 'prop-types';
 import Button from '../../../components/ui/button';
 import { Tag } from '../../../components/component-library';
 
-import { SUPPORT_REQUEST_LINK } from '../../../helpers/constants/common';
+import {
+  SUPPORT_REQUEST_LINK,
+  ///: BEGIN:ONLY_INCLUDE_IN(mmi)
+  MMI_WEB_SITE,
+  ///: END:ONLY_INCLUDE_IN
+} from '../../../helpers/constants/common';
 import { isBeta } from '../../../helpers/utils/build-types';
 import {
   getNumberOfSettingsInSection,
@@ -47,6 +52,17 @@ export default class InfoTab extends PureComponent {
 
   renderInfoLinks() {
     const { t } = this.context;
+    let privacyUrl, siteUrl;
+
+    ///: BEGIN:ONLY_INCLUDE_IN(mmi)
+    privacyUrl = 'https://consensys.net/codefi/about/privacy-policy/';
+    siteUrl = MMI_WEB_SITE;
+    ///: END:ONLY_INCLUDE_IN
+
+    ///: BEGIN:ONLY_INCLUDE_IN(main,beta,flask)
+    privacyUrl = 'https://metamask.io/privacy.html';
+    siteUrl = 'https://metamask.io/';
+    ///: END:ONLY_INCLUDE_IN
 
     return (
       <div className="settings-page__content-item settings-page__content-item--without-height">
@@ -56,7 +72,7 @@ export default class InfoTab extends PureComponent {
         <div ref={this.settingsRefs[2]} className="info-tab__link-item">
           <Button
             type="link"
-            href="https://metamask.io/privacy.html"
+            href={privacyUrl}
             target="_blank"
             rel="noopener noreferrer"
             className="info-tab__link-text"
@@ -129,7 +145,7 @@ export default class InfoTab extends PureComponent {
         <div ref={this.settingsRefs[6]} className="info-tab__link-item">
           <Button
             type="link"
-            href="https://metamask.io/"
+            href={siteUrl}
             target="_blank"
             rel="noopener noreferrer"
             className="info-tab__link-text"
@@ -173,6 +189,17 @@ export default class InfoTab extends PureComponent {
       <div className="settings-page__body">
         <div className="settings-page__content-row">
           <div className="settings-page__content-item settings-page__content-item--without-height">
+            {
+              ///: BEGIN:ONLY_INCLUDE_IN(mmi)
+              <div className="info-tab__logo-wrapper">
+                <img
+                  src="images/info-logo.png"
+                  className="info-tab__logo"
+                  alt=""
+                />
+              </div>
+              ///: END:ONLY_INCLUDE_IN
+            }
             <div className="info-tab__item">
               <div
                 ref={this.settingsRefs[0]}
@@ -185,18 +212,33 @@ export default class InfoTab extends PureComponent {
               </div>
             </div>
             <div className="info-tab__item">
-              <div className="info-tab__about">{t('builtAroundTheWorld')}</div>
+              <div className="info-tab__about">
+                {
+                  ///: BEGIN:ONLY_INCLUDE_IN(main,beta,flask)
+                  t('builtAroundTheWorld')
+                  ///: END:ONLY_INCLUDE_IN
+                }
+                {
+                  ///: BEGIN:ONLY_INCLUDE_IN(mmi)
+                  t('mmiBuiltAroundTheWorld')
+                  ///: END:ONLY_INCLUDE_IN
+                }
+              </div>
             </div>
           </div>
           {this.renderInfoLinks()}
         </div>
-        <div className="info-tab__logo-wrapper">
-          <img
-            src="./images/logo/metamask-fox.svg"
-            className="info-tab__logo"
-            alt="MetaMask Logo"
-          />
-        </div>
+        {
+          ///: BEGIN:ONLY_INCLUDE_IN(main,beta,flask)
+          <div className="info-tab__logo-wrapper">
+            <img
+              src="./images/logo/metamask-fox.svg"
+              className="info-tab__logo"
+              alt="MetaMask Logo"
+            />
+          </div>
+          ///: END:ONLY_INCLUDE_IN
+        }
       </div>
     );
   }

From 18a21ca57eadd587db60221cc1171ed76cc40585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Fri, 31 Mar 2023 14:21:58 +0100
Subject: [PATCH 108/129] Adds build type mmi (#18399)

* adds build type mmi

* run prettier
---
 development/build/utils.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/development/build/utils.js b/development/build/utils.js
index b0df586b1..ce88d1f09 100644
--- a/development/build/utils.js
+++ b/development/build/utils.js
@@ -58,7 +58,12 @@ function getBrowserVersionMap(platforms, version) {
     if (!String(buildVersion).match(/^\d+$/u)) {
       throw new Error(`Invalid prerelease build version: '${buildVersion}'`);
     } else if (
-      ![BuildType.beta, BuildType.flask, BuildType.desktop].includes(buildType)
+      ![
+        BuildType.beta,
+        BuildType.flask,
+        BuildType.desktop,
+        BuildType.mmi,
+      ].includes(buildType)
     ) {
       throw new Error(`Invalid prerelease build type: ${buildType}`);
     }

From fbd68d4a3f7ffb6f142515bed962fbaca7241f3e Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Fri, 31 Mar 2023 14:22:33 +0100
Subject: [PATCH 109/129] Introduce action metrics for mv3 service worker
 restart (#18346)

* fix dapp interaction e2e test

* wip

* add sentry post request mock

* fix console errors

* fix scripting console error and remove e2e test unnecessary check

* clean up

* remove e2e test

* stop skipping  test

* fixing build mv3 job

* fixing unit tests

* fixing unit tests

* fixing unit tests

* update coverages

* revert skip mv3 e2e test

* remove IN_TEST on the npm script

* remove console.log

* revert aria label changes

* revert aria label changes

* revert permission changes

* revert permission changes

* implement sw restart delay tracking

* fix rebase
---
 app/scripts/background.js              |  4 ++++
 app/scripts/controllers/app-state.js   |  7 ++++++
 app/scripts/metamask-controller.js     | 30 +++++++++++++++++++++++++-
 package.json                           |  2 ++
 shared/constants/metametrics.js        |  2 ++
 shared/constants/test-flags.js         |  1 +
 test/e2e/fixture-builder.js            |  4 ++++
 test/e2e/mv3/dapp-interactions.spec.js |  1 +
 test/e2e/webdriver/driver.js           | 16 ++++++--------
 ui/store/action-queue/index.test.js    |  7 ++++++
 ui/store/action-queue/index.ts         | 17 +++++++++++++++
 11 files changed, 81 insertions(+), 10 deletions(-)
 create mode 100644 shared/constants/test-flags.js

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 956487f89..2fdca5a16 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -556,6 +556,10 @@ export function setupController(initState, initLangCode, overrides) {
           if (message.name === WORKER_KEEP_ALIVE_MESSAGE) {
             // To test un-comment this line and wait for 1 minute. An error should be shown on MetaMask UI.
             remotePort.postMessage({ name: ACK_KEEP_ALIVE_MESSAGE });
+
+            controller.appStateController.setServiceWorkerLastActiveTime(
+              Date.now(),
+            );
           }
         });
       }
diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js
index 7d1c83a4e..f7669e055 100644
--- a/app/scripts/controllers/app-state.js
+++ b/app/scripts/controllers/app-state.js
@@ -51,6 +51,7 @@ export default class AppStateController extends EventEmitter {
         '0x5': true,
         '0x539': true,
       },
+      serviceWorkerLastActiveTime: 0,
     });
     this.timer = null;
 
@@ -362,4 +363,10 @@ export default class AppStateController extends EventEmitter {
   getCurrentPopupId() {
     return this.store.getState().currentPopupId;
   }
+
+  setServiceWorkerLastActiveTime(serviceWorkerLastActiveTime) {
+    this.store.updateState({
+      serviceWorkerLastActiveTime,
+    });
+  }
 }
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 426fc9058..93670073d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -121,6 +121,7 @@ import { isMain, isFlask } from '../../shared/constants/environment';
 // eslint-disable-next-line import/order
 import { DesktopController } from '@metamask/desktop/dist/controllers/desktop';
 ///: END:ONLY_INCLUDE_IN
+import { ACTION_QUEUE_METRICS_E2E_TEST } from '../../shared/constants/test-flags';
 import {
   onMessageReceived,
   checkForMultipleVersionsRunning,
@@ -695,6 +696,7 @@ export default class MetamaskController extends EventEmitter {
     this.keyringController.memStore.subscribe((state) =>
       this._onKeyringControllerUpdate(state),
     );
+
     this.keyringController.on('unlock', () => this._onUnlock());
     this.keyringController.on('lock', () => this._onLock());
 
@@ -1190,6 +1192,25 @@ export default class MetamaskController extends EventEmitter {
       },
     );
 
+    if (isManifestV3 && globalThis.isFirstTimeProfileLoaded === false) {
+      const { serviceWorkerLastActiveTime } =
+        this.appStateController.store.getState();
+      const metametricsPayload = {
+        category: EVENT.SOURCE.SERVICE_WORKERS,
+        event: EVENT_NAMES.SERVICE_WORKER_RESTARTED,
+        properties: {
+          service_worker_restarted_time:
+            Date.now() - serviceWorkerLastActiveTime,
+        },
+      };
+
+      try {
+        this.metaMetricsController.trackEvent(metametricsPayload);
+      } catch (e) {
+        log.warn('Failed to track service worker restart metric:', e);
+      }
+    }
+
     this.metamaskMiddleware = createMetamaskMiddleware({
       static: {
         eth_syncing: false,
@@ -2627,7 +2648,7 @@ export default class MetamaskController extends EventEmitter {
     try {
       // Automatic login via config password
       const password = process.env.CONF?.PASSWORD;
-      if (password) {
+      if (password && !process.env.IN_TEST) {
         await this.submitPassword(password);
       }
       // Automatic login via storage encryption key
@@ -2960,6 +2981,13 @@ export default class MetamaskController extends EventEmitter {
    * @returns {} keyState
    */
   async addNewAccount(accountCount) {
+    const isActionMetricsQueueE2ETest =
+      this.appStateController.store.getState()[ACTION_QUEUE_METRICS_E2E_TEST];
+
+    if (process.env.IN_TEST && isActionMetricsQueueE2ETest) {
+      await new Promise((resolve) => setTimeout(resolve, 5_000));
+    }
+
     const [primaryKeyring] = this.keyringController.getKeyringsByType(
       KeyringType.hdKeyTree,
     );
diff --git a/package.json b/package.json
index c7aa8f8ed..b6849a24d 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "build:test": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 PORTFOLIO_URL=http://127.0.0.1:8080 yarn build test",
     "build:test:flask": "yarn build test --build-type flask",
     "build:test:mv3": "ENABLE_MV3=true SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 PORTFOLIO_URL=http://127.0.0.1:8080 yarn build test",
+    "build:test:dev:mv3": "ENABLE_MV3=true SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 PORTFOLIO_URL=http://127.0.0.1:8080 yarn build:dev testDev --apply-lavamoat=false",
     "test": "yarn lint && yarn test:unit && yarn test:unit:jest",
     "dapp": "node development/static-server.js node_modules/@metamask/test-dapp/dist --port 8080",
     "dapp-chain": "GANACHE_ARGS='-b 2' concurrently -k -n ganache,dapp -p '[{time}][{name}]' 'yarn ganache:start' 'sleep 5 && yarn dapp'",
@@ -32,6 +33,7 @@
     "test:unit:mocha": "node ./test/run-unit-tests.js --mocha",
     "test:e2e:chrome": "SELENIUM_BROWSER=chrome node test/e2e/run-all.js",
     "test:e2e:chrome:snaps": "SELENIUM_BROWSER=chrome node test/e2e/run-all.js --snaps",
+    "test:e2e:chrome:mv3": "SELENIUM_BROWSER=chrome node test/e2e/run-all.js --mv3",
     "test:e2e:firefox": "SELENIUM_BROWSER=firefox node test/e2e/run-all.js",
     "test:e2e:firefox:snaps": "SELENIUM_BROWSER=firefox node test/e2e/run-all.js --snaps",
     "test:e2e:single": "node test/e2e/run-e2e-test.js",
diff --git a/shared/constants/metametrics.js b/shared/constants/metametrics.js
index de3244c42..1eeb0a314 100644
--- a/shared/constants/metametrics.js
+++ b/shared/constants/metametrics.js
@@ -374,6 +374,7 @@ export const EVENT_NAMES = {
   ONBOARDING_WALLET_IMPORT_ATTEMPTED: 'Wallet Import Attempted',
   ONBOARDING_WALLET_VIDEO_PLAY: 'SRP Intro Video Played',
   ONBOARDING_TWITTER_CLICK: 'External Link Clicked',
+  SERVICE_WORKER_RESTARTED: 'Service Worker Restarted',
 };
 
 export const EVENT = {
@@ -447,6 +448,7 @@ export const EVENT = {
       DAPP: 'dapp',
       USER: 'user',
     },
+    SERVICE_WORKERS: 'service_workers',
   },
   LOCATION: {
     TOKEN_DETAILS: 'token_details',
diff --git a/shared/constants/test-flags.js b/shared/constants/test-flags.js
new file mode 100644
index 000000000..a5018d6be
--- /dev/null
+++ b/shared/constants/test-flags.js
@@ -0,0 +1 @@
+export const ACTION_QUEUE_METRICS_E2E_TEST = 'action_queue_metrics_e2e_test';
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 81b4d6385..5e3695a05 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -4,6 +4,9 @@ const {
 } = require('@metamask/snaps-utils');
 const { merge } = require('lodash');
 const { CHAIN_IDS } = require('../../shared/constants/network');
+const {
+  ACTION_QUEUE_METRICS_E2E_TEST,
+} = require('../../shared/constants/test-flags');
 const { SMART_CONTRACTS } = require('./seeder/smart-contracts');
 
 function defaultFixture() {
@@ -309,6 +312,7 @@ function onboardingFixture() {
           [CHAIN_IDS.GOERLI]: true,
           [CHAIN_IDS.LOCALHOST]: true,
         },
+        [ACTION_QUEUE_METRICS_E2E_TEST]: false,
       },
       NetworkController: {
         networkId: '1337',
diff --git a/test/e2e/mv3/dapp-interactions.spec.js b/test/e2e/mv3/dapp-interactions.spec.js
index 8020047cf..294182cc9 100644
--- a/test/e2e/mv3/dapp-interactions.spec.js
+++ b/test/e2e/mv3/dapp-interactions.spec.js
@@ -12,6 +12,7 @@ describe('MV3 - Dapp interactions', function () {
         balance: convertToHexValue(25000000000000000000),
       },
     ],
+    concurrent: { port: 8546, chainId: 1338 },
   };
   it('should continue to support dapp interactions after service worker re-start', async function () {
     await withFixtures(
diff --git a/test/e2e/webdriver/driver.js b/test/e2e/webdriver/driver.js
index 09bdccb1b..2b2fcb386 100644
--- a/test/e2e/webdriver/driver.js
+++ b/test/e2e/webdriver/driver.js
@@ -428,10 +428,6 @@ class Driver {
     const artifactDir = `./test-artifacts/${this.browser}/${title}`;
     const filepathBase = `${artifactDir}/test-failure`;
     await fs.mkdir(artifactDir, { recursive: true });
-    const isPageError = await this.isElementPresent('.error-page__details');
-    if (isPageError) {
-      await this.clickElement('.error-page__details');
-    }
     const screenshot = await this.driver.takeScreenshot();
     await fs.writeFile(`${filepathBase}-screenshot.png`, screenshot, {
       encoding: 'base64',
@@ -482,20 +478,22 @@ class Driver {
       // 4Byte
       'Failed to load resource: the server responded with a status of 502 (Bad Gateway)',
     ];
+
     const { errors } = this;
     const cdpConnection = await this.driver.createCDPConnection('page');
     await this.driver.onLogEvent(cdpConnection, (event) => {
       if (event.type === 'error') {
-        const eventDescription = event.args.filter(
+        const eventDescriptions = event.args.filter(
           (err) => err.description !== undefined,
         );
-        const [{ description }] = eventDescription;
+
+        const [eventDescription] = eventDescriptions;
         const ignore = ignoredErrorMessages.some((message) =>
-          description.includes(message),
+          eventDescription?.description.includes(message),
         );
         if (!ignore) {
-          errors.push(description);
-          logBrowserError(failOnConsoleError, description);
+          errors.push(eventDescription?.description);
+          logBrowserError(failOnConsoleError, eventDescription?.description);
         }
       }
     });
diff --git a/ui/store/action-queue/index.test.js b/ui/store/action-queue/index.test.js
index 157ac3cb5..d93aa28a8 100644
--- a/ui/store/action-queue/index.test.js
+++ b/ui/store/action-queue/index.test.js
@@ -41,6 +41,7 @@ describe('ActionQueue', () => {
       expect(background.backgroundFunction.called).toStrictEqual(false);
     });
   });
+
   describe('submitRequestToBackground', () => {
     it('calls promisified background method if the stream is connected', async () => {
       const background = {
@@ -74,6 +75,7 @@ describe('ActionQueue', () => {
           readable: false,
         },
         backgroundFunction3: sinon.stub().yields(),
+        trackMetaMetricsEvent: sinon.stub().yields(),
       };
       _setBackgroundConnection(background);
       const requestPromise = submitRequestToBackground('backgroundFunction3');
@@ -133,6 +135,7 @@ describe('ActionQueue', () => {
           trace.secondStarted = Date.now();
           setTimeout(() => cb(null, 'second'), 10);
         },
+        trackMetaMetricsEvent: sinon.stub().yields(),
       };
       _setBackgroundConnection(background);
       const scheduled = Promise.all([
@@ -159,6 +162,7 @@ describe('ActionQueue', () => {
           trace.secondStarted = Date.now();
           setTimeout(() => cb(null, 'second'), 10);
         },
+        trackMetaMetricsEvent: sinon.stub().yields(),
       };
       _setBackgroundConnection(background);
       const scheduled = Promise.all([
@@ -189,6 +193,7 @@ describe('ActionQueue', () => {
           trace.secondStarted = Date.now();
           setTimeout(() => cb(null, 'second'), 10);
         },
+        trackMetaMetricsEvent: sinon.stub().yields(),
       };
       _setBackgroundConnection(background);
       const scheduled = Promise.all([
@@ -217,6 +222,7 @@ describe('ActionQueue', () => {
           }, 5);
         },
         second: sinon.stub().yields(),
+        trackMetaMetricsEvent: sinon.stub().yields(),
       };
       _setBackgroundConnection(background);
       const scheduled = Promise.race([
@@ -251,6 +257,7 @@ describe('ActionQueue', () => {
           setTimeout(() => cb(null, 'second'), 10);
         },
         third: sinon.stub().yields(),
+        trackMetaMetricsEvent: sinon.stub().yields(),
       };
       flowControl.triggerRaceCondition = () => {
         flowControl.waitFor = submitRequestToBackground('third');
diff --git a/ui/store/action-queue/index.ts b/ui/store/action-queue/index.ts
index 86cdb0cef..53b8ce822 100644
--- a/ui/store/action-queue/index.ts
+++ b/ui/store/action-queue/index.ts
@@ -1,5 +1,8 @@
 import pify from 'pify';
+import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
 import { isManifestV3 } from '../../../shared/modules/mv3.utils';
+import { trackMetaMetricsEvent } from '../actions';
+
 // // A simplified pify maybe?
 // function pify(apiObject) {
 //   return Object.keys(apiObject).reduce((promisifiedAPI, key) => {
@@ -187,6 +190,20 @@ async function processActionRetryQueue() {
   }
   processingQueue = true;
   try {
+    if (actionRetryQueue.length > 0) {
+      const metametricsPayload = {
+        category: EVENT.SOURCE.SERVICE_WORKERS,
+        event: EVENT_NAMES.SERVICE_WORKER_RESTARTED,
+        properties: {
+          service_worker_action_queue_methods: actionRetryQueue.map(
+            (action) => action.request.method,
+          ),
+        },
+      };
+
+      trackMetaMetricsEvent(metametricsPayload);
+    }
+
     while (
       background?.connectionStream.readable &&
       actionRetryQueue.length > 0

From 41210084dd8341d65c825f4aaefca5c67baf3afe Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 31 Mar 2023 07:04:55 -0700
Subject: [PATCH 110/129] Allow specific origin to direct to second page of
 token allowance flow (#18395)

* Allow specific origin to direct to second page of token allowance flow

* Remove accidentally committed git diff text

---------

Co-authored-by: Erik Marks <25517051+rekmarks@users.noreply.github.com>
---
 ui/pages/token-allowance/token-allowance.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/pages/token-allowance/token-allowance.js b/ui/pages/token-allowance/token-allowance.js
index 5aed6bde7..bee8875db 100644
--- a/ui/pages/token-allowance/token-allowance.js
+++ b/ui/pages/token-allowance/token-allowance.js
@@ -65,6 +65,8 @@ import SimulationErrorMessage from '../../components/ui/simulation-error-message
 import { Icon, ICON_NAMES } from '../../components/component-library';
 import LedgerInstructionField from '../../components/app/ledger-instruction-field/ledger-instruction-field';
 
+const ALLOWED_HOSTS = ['portfolio.metamask.io'];
+
 export default function TokenAllowance({
   origin,
   siteImage,
@@ -94,10 +96,13 @@ export default function TokenAllowance({
   const history = useHistory();
   const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
 
+  const { hostname } = new URL(origin);
+  const thisOriginIsAllowedToSkipFirstPage = ALLOWED_HOSTS.includes(hostname);
+
   const [showContractDetails, setShowContractDetails] = useState(false);
   const [showFullTxDetails, setShowFullTxDetails] = useState(false);
   const [isFirstPage, setIsFirstPage] = useState(
-    dappProposedTokenAmount !== '0',
+    dappProposedTokenAmount !== '0' && !thisOriginIsAllowedToSkipFirstPage,
   );
   const [errorText, setErrorText] = useState('');
   const [userAcknowledgedGasMissing, setUserAcknowledgedGasMissing] =
@@ -109,11 +114,14 @@ export default function TokenAllowance({
   const currentAccount = useSelector(getCurrentAccountWithSendEtherInfo);
   const networkIdentifier = useSelector(getNetworkIdentifier);
   const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
-  const customTokenAmount = useSelector(getCustomTokenAmount);
   const unapprovedTxCount = useSelector(getUnapprovedTxCount);
   const unapprovedTxs = useSelector(getUnapprovedTransactions);
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const isHardwareWalletConnected = useSelector(isHardwareWallet);
+  let customTokenAmount = useSelector(getCustomTokenAmount);
+  if (thisOriginIsAllowedToSkipFirstPage && dappProposedTokenAmount) {
+    customTokenAmount = dappProposedTokenAmount;
+  }
 
   const replaceCommaToDot = (inputValue) => {
     return inputValue.replace(/,/gu, '.');

From 74b9ab28f3b921b18f72118b49bc11e80400254b Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 31 Mar 2023 10:41:51 -0500
Subject: [PATCH 111/129] UX: Multichain: Close account menu when item is
 clicked (#18393)

---
 ui/components/multichain/account-list-menu/account-list-menu.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/components/multichain/account-list-menu/account-list-menu.js b/ui/components/multichain/account-list-menu/account-list-menu.js
index c054b115d..10d48a057 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.js
+++ b/ui/components/multichain/account-list-menu/account-list-menu.js
@@ -103,6 +103,7 @@ export const AccountListMenu = ({ onClose }) => {
                     },
                   });
                   dispatch(setSelectedAccount(account.address));
+                  onClose();
                 }}
                 identity={account}
                 key={account.address}

From bbfc455342427589b5bc41510c1dc02122fa758b Mon Sep 17 00:00:00 2001
From: Elliot Winkler <elliot.winkler@gmail.com>
Date: Fri, 31 Mar 2023 10:52:33 -0600
Subject: [PATCH 112/129] Convert shared/modules/fetch-with-timeout to TS
 (#18351)

We want to convert NetworkController to TypeScript in order to be able
to compare differences in the controller between in this repo and the
core repo. To do this, however, we need to convert the dependencies of
the controller to TypeScript.

As a part of this effort, this commit converts
`shared/modules/fetch-with-timeout.js` to TypeScript.
---
 ...out.test.js => fetch-with-timeout.test.ts} |  0
 ...-with-timeout.js => fetch-with-timeout.ts} | 22 ++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)
 rename shared/modules/{fetch-with-timeout.test.js => fetch-with-timeout.test.ts} (100%)
 rename shared/modules/{fetch-with-timeout.js => fetch-with-timeout.ts} (51%)

diff --git a/shared/modules/fetch-with-timeout.test.js b/shared/modules/fetch-with-timeout.test.ts
similarity index 100%
rename from shared/modules/fetch-with-timeout.test.js
rename to shared/modules/fetch-with-timeout.test.ts
diff --git a/shared/modules/fetch-with-timeout.js b/shared/modules/fetch-with-timeout.ts
similarity index 51%
rename from shared/modules/fetch-with-timeout.js
rename to shared/modules/fetch-with-timeout.ts
index 791470d77..f5c6d5384 100644
--- a/shared/modules/fetch-with-timeout.js
+++ b/shared/modules/fetch-with-timeout.ts
@@ -1,12 +1,25 @@
 import { memoize } from 'lodash';
 import { SECOND } from '../constants/time';
 
+/**
+ * Returns a function that can be used to make an HTTP request but timing out
+ * automatically after a desired amount of time.
+ *
+ * @param timeout - The number of milliseconds to wait until the request times
+ * out.
+ * @returns A function that, when called, returns a promise that either resolves
+ * to the HTTP response object or is rejected if a network error is encountered
+ * or the request times out.
+ */
 const getFetchWithTimeout = memoize((timeout = SECOND * 30) => {
   if (!Number.isInteger(timeout) || timeout < 1) {
     throw new Error('Must specify positive integer timeout.');
   }
 
-  return async function _fetch(url, opts) {
+  return async function fetchWithTimeout(
+    url: RequestInfo,
+    opts?: RequestInit,
+  ): Promise<Response> {
     const abortController = new window.AbortController();
     const { signal } = abortController;
     const f = window.fetch(url, {
@@ -17,12 +30,9 @@ const getFetchWithTimeout = memoize((timeout = SECOND * 30) => {
     const timer = setTimeout(() => abortController.abort(), timeout);
 
     try {
-      const res = await f;
+      return await f;
+    } finally {
       clearTimeout(timer);
-      return res;
-    } catch (e) {
-      clearTimeout(timer);
-      throw e;
     }
   };
 });

From ae08035d5dbaead6ec920a2cf743512092299e61 Mon Sep 17 00:00:00 2001
From: Elliot Winkler <elliot.winkler@gmail.com>
Date: Fri, 31 Mar 2023 10:52:56 -0600
Subject: [PATCH 113/129] Convert shared/modules/network.utils to TS (#18352)

We want to convert NetworkController to TypeScript in order to be able
to compare differences in the controller between in this repo and the
core repo. To do this, however, we need to convert the dependencies of
the controller to TypeScript.

As a part of this effort, this commit converts
`shared/modules/network.utils.js` to TypeScript, and also adds tests.

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 shared/modules/network.utils.test.ts          | 86 +++++++++++++++++++
 .../{network.utils.js => network.utils.ts}    | 29 ++++---
 2 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 shared/modules/network.utils.test.ts
 rename shared/modules/{network.utils.js => network.utils.ts} (52%)

diff --git a/shared/modules/network.utils.test.ts b/shared/modules/network.utils.test.ts
new file mode 100644
index 000000000..ee4ef3f83
--- /dev/null
+++ b/shared/modules/network.utils.test.ts
@@ -0,0 +1,86 @@
+import { MAX_SAFE_CHAIN_ID } from '../constants/network';
+import {
+  isSafeChainId,
+  isPrefixedFormattedHexString,
+  isTokenDetectionEnabledForNetwork,
+} from './network.utils';
+
+describe('network utils', () => {
+  describe('isSafeChainId', () => {
+    it('returns true given an integer greater than 0 and less than or equal to the max safe chain ID', () => {
+      expect(isSafeChainId(3)).toBe(true);
+    });
+
+    it('returns true given the max safe chain ID', () => {
+      expect(isSafeChainId(MAX_SAFE_CHAIN_ID)).toBe(true);
+    });
+
+    it('returns false given something other than an integer', () => {
+      expect(isSafeChainId('not-an-integer')).toBe(false);
+    });
+
+    it('returns false given a negative integer', () => {
+      expect(isSafeChainId(-1)).toBe(false);
+    });
+
+    it('returns false given an integer greater than the max safe chain ID', () => {
+      expect(isSafeChainId(MAX_SAFE_CHAIN_ID + 1)).toBe(false);
+    });
+  });
+
+  describe('isPrefixedFormattedHexString', () => {
+    it('returns true given a string that matches a hex number formatted as a "0x"-prefixed, non-zero, non-zero-padded string', () => {
+      expect(isPrefixedFormattedHexString('0x1')).toBe(true);
+      expect(isPrefixedFormattedHexString('0xa')).toBe(true);
+      expect(isPrefixedFormattedHexString('0xabc123')).toBe(true);
+    });
+
+    it('returns true given a "0x"-prefixed hex string that contains uppercase characters', () => {
+      expect(isPrefixedFormattedHexString('0XABC123')).toBe(true);
+    });
+
+    it('returns false given a "0x"-prefixed hex string that evaluates to zero', () => {
+      expect(isPrefixedFormattedHexString('0x0')).toBe(false);
+    });
+
+    it('returns false given a "0x"-prefixed hex string that does not evaluate to zero but is zero-padded', () => {
+      expect(isPrefixedFormattedHexString('0x01')).toBe(false);
+    });
+
+    it('returns false given a hex number that is simply a string but not "0x"-prefixed', () => {
+      expect(isPrefixedFormattedHexString('abc123')).toBe(false);
+    });
+
+    it('returns false if given something other than a string', () => {
+      expect(isPrefixedFormattedHexString({ something: 'else' })).toBe(false);
+    });
+  });
+
+  describe('isTokenDetectionEnabledForNetwork', () => {
+    it('returns true given the chain ID for Mainnet', () => {
+      expect(isTokenDetectionEnabledForNetwork('0x1')).toBe(true);
+    });
+
+    it('returns true given the chain ID for BSC', () => {
+      expect(isTokenDetectionEnabledForNetwork('0x38')).toBe(true);
+    });
+
+    it('returns true given the chain ID for Polygon', () => {
+      expect(isTokenDetectionEnabledForNetwork('0x89')).toBe(true);
+    });
+
+    it('returns true given the chain ID for Avalanche', () => {
+      expect(isTokenDetectionEnabledForNetwork('0xa86a')).toBe(true);
+    });
+
+    it('returns false given a string that is not the chain ID for Mainnet, BSC, Polygon, or Avalanche', () => {
+      expect(isTokenDetectionEnabledForNetwork('some other chain ID')).toBe(
+        false,
+      );
+    });
+
+    it('returns false given undefined', () => {
+      expect(isTokenDetectionEnabledForNetwork(undefined)).toBe(false);
+    });
+  });
+});
diff --git a/shared/modules/network.utils.js b/shared/modules/network.utils.ts
similarity index 52%
rename from shared/modules/network.utils.js
rename to shared/modules/network.utils.ts
index 05723b3ac..13fca471d 100644
--- a/shared/modules/network.utils.js
+++ b/shared/modules/network.utils.ts
@@ -5,24 +5,22 @@ import { CHAIN_IDS, MAX_SAFE_CHAIN_ID } from '../constants/network';
  * Because some cryptographic libraries we use expect the chain ID to be a
  * number primitive, it must not exceed a certain size.
  *
- * @param {number} chainId - The chain ID to check for safety.
- * @returns {boolean} Whether the given chain ID is safe.
+ * @param chainId - The chain ID to check for safety.
+ * @returns Whether the given chain ID is safe.
  */
-export function isSafeChainId(chainId) {
-  return (
-    Number.isSafeInteger(chainId) && chainId > 0 && chainId <= MAX_SAFE_CHAIN_ID
-  );
+export function isSafeChainId(chainId: unknown): boolean {
+  return isSafeInteger(chainId) && chainId > 0 && chainId <= MAX_SAFE_CHAIN_ID;
 }
 
 /**
  * Checks whether the given value is a 0x-prefixed, non-zero, non-zero-padded,
  * hexadecimal string.
  *
- * @param {any} value - The value to check.
- * @returns {boolean} True if the value is a correctly formatted hex string,
+ * @param value - The value to check.
+ * @returns True if the value is a correctly formatted hex string,
  * false otherwise.
  */
-export function isPrefixedFormattedHexString(value) {
+export function isPrefixedFormattedHexString(value: unknown) {
   if (typeof value !== 'string') {
     return false;
   }
@@ -35,7 +33,7 @@ export function isPrefixedFormattedHexString(value) {
  * @param chainId - ChainID of network
  * @returns Whether the current network supports token detection
  */
-export function isTokenDetectionEnabledForNetwork(chainId) {
+export function isTokenDetectionEnabledForNetwork(chainId: string | undefined) {
   switch (chainId) {
     case CHAIN_IDS.MAINNET:
     case CHAIN_IDS.BSC:
@@ -46,3 +44,14 @@ export function isTokenDetectionEnabledForNetwork(chainId) {
       return false;
   }
 }
+
+/**
+ * Like {@link Number.isSafeInteger}, but types the input as a `number` if it is
+ * indeed a safe integer.
+ *
+ * @param value - The value to check.
+ * @returns True if the value is a safe integer, false otherwise.
+ */
+function isSafeInteger(value: unknown): value is number {
+  return Number.isSafeInteger(value);
+}

From 0bbfd38cc6b50386bd9b30d6336db18455d2796e Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Fri, 31 Mar 2023 22:53:27 +0530
Subject: [PATCH 114/129] UX Multichain: Menu for Site connections and
 permissions (#18167)

* added site connection menu component

* reverted change for unlock page

* updated snapshot

* updated state with useSelector

* updated state for connected

* updated icons

* updated test

* updated snapshot

* moved component to multichain folder

* updated color

* added multichain connection to menu bar

* updated default color

* updated css

* updated multichain site with connected site info

* updated ui for not connected state

* removed scripts

* updated lint errors

* updated lint errors

* updated stories

* updated story for not connected to current state

* updated story for not connected to current state

* updated badge to 16px

* updated badge position

* updated snapshot

* fixed lint errors

* updated not connected state icon

* updated constants for status and added new locale string
---
 app/_locales/en/messages.json                 |   9 ++
 .../connected-status-indicator.js             |  30 ++++-
 ui/components/app/menu-bar/menu-bar.js        |   2 +-
 ui/components/multichain/index.js             |   1 +
 .../multichain/multichain-components.scss     |   1 +
 ...ultichain-connected-site-menu.test.js.snap | 112 ++++++++++++++++++
 .../multichain-connected-site-menu/index.js   |   1 +
 .../multichain-connected-site-menu/index.scss |  23 ++++
 .../multichain-connected-site-menu.js         |  98 +++++++++++++++
 .../multichain-connected-site-menu.stories.js |  51 ++++++++
 .../multichain-connected-site-menu.test.js    |  87 ++++++++++++++
 11 files changed, 409 insertions(+), 6 deletions(-)
 create mode 100644 ui/components/multichain/multichain-connected-site-menu/__snapshots__/multichain-connected-site-menu.test.js.snap
 create mode 100644 ui/components/multichain/multichain-connected-site-menu/index.js
 create mode 100644 ui/components/multichain/multichain-connected-site-menu/index.scss
 create mode 100644 ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.js
 create mode 100644 ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.stories.js
 create mode 100644 ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.test.js

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index c9669541e..a14cbc3e1 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3753,6 +3753,9 @@
   "statusNotConnected": {
     "message": "Not connected"
   },
+  "statusNotConnectedAccount": {
+    "message": "No accounts connected"
+  },
   "step1LatticeWallet": {
     "message": "Connect your Lattice1"
   },
@@ -4351,6 +4354,12 @@
   "tooltipApproveButton": {
     "message": "I understand"
   },
+  "tooltipSatusConnected": {
+    "message": "connected"
+  },
+  "tooltipSatusNotConnected": {
+    "message": "not connected"
+  },
   "total": {
     "message": "Total"
   },
diff --git a/ui/components/app/connected-status-indicator/connected-status-indicator.js b/ui/components/app/connected-status-indicator/connected-status-indicator.js
index 1abca94f3..55a268510 100644
--- a/ui/components/app/connected-status-indicator/connected-status-indicator.js
+++ b/ui/components/app/connected-status-indicator/connected-status-indicator.js
@@ -8,13 +8,17 @@ import {
   STATUS_NOT_CONNECTED,
 } from '../../../helpers/constants/connected-sites';
 import ColorIndicator from '../../ui/color-indicator';
-import { Color } from '../../../helpers/constants/design-system';
+import {
+  BackgroundColor,
+  Color,
+} from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
   getAddressConnectedSubjectMap,
   getOriginOfCurrentTab,
   getSelectedAddress,
 } from '../../../selectors';
+import { MultichainConnectedSiteMenu } from '../../multichain';
 
 export default function ConnectedStatusIndicator({ onClick }) {
   const t = useI18nContext();
@@ -38,23 +42,39 @@ export default function ConnectedStatusIndicator({ onClick }) {
 
   let indicatorType = ColorIndicator.TYPES.OUTLINE;
   let indicatorColor = Color.iconDefault;
+  let globalMenuColor = Color.iconAlternative;
 
   if (status === STATUS_CONNECTED) {
     indicatorColor = Color.successDefault;
     indicatorType = ColorIndicator.TYPES.PARTIAL;
+    globalMenuColor = Color.successDefault;
   } else if (status === STATUS_CONNECTED_TO_ANOTHER_ACCOUNT) {
     indicatorColor = Color.errorDefault;
+    globalMenuColor = BackgroundColor.backgroundDefault;
   }
 
   const text =
     status === STATUS_CONNECTED
       ? t('statusConnected')
-      : t('statusNotConnected');
-
+      : t('statusNotConnected'); // TODO: Remove text since we only need the tooltip text for new permission icon
+  const tooltipText =
+    status === STATUS_CONNECTED
+      ? t('tooltipSatusConnected')
+      : t('tooltipSatusNotConnected');
   return (
     <button className="connected-status-indicator" onClick={onClick}>
-      <ColorIndicator color={indicatorColor} type={indicatorType} />
-      <div className="connected-status-indicator__text">{text}</div>
+      {process.env.MULTICHAIN ? (
+        <MultichainConnectedSiteMenu
+          status={status}
+          globalMenuColor={globalMenuColor}
+          text={tooltipText}
+        />
+      ) : (
+        <>
+          <ColorIndicator color={indicatorColor} type={indicatorType} />
+          <div className="connected-status-indicator__text">{text}</div>
+        </>
+      )}
     </button>
   );
 }
diff --git a/ui/components/app/menu-bar/menu-bar.js b/ui/components/app/menu-bar/menu-bar.js
index bf80cad5d..3ddc301af 100644
--- a/ui/components/app/menu-bar/menu-bar.js
+++ b/ui/components/app/menu-bar/menu-bar.js
@@ -30,7 +30,7 @@ export default function MenuBar() {
 
   return (
     <div className="menu-bar">
-      {showStatus ? (
+      {showStatus ? ( // TODO: Move the connection status menu icon to the correct position in header once we implement the new header
         <ConnectedStatusIndicator
           onClick={() => history.push(CONNECTED_ACCOUNTS_ROUTE)}
         />
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
index b686c0948..debaef289 100644
--- a/ui/components/multichain/index.js
+++ b/ui/components/multichain/index.js
@@ -7,3 +7,4 @@ export { GlobalMenu } from './global-menu';
 export { MultichainImportTokenLink } from './multichain-import-token-link';
 export { MultichainTokenListItem } from './multichain-token-list-item';
 export { AddressCopyButton } from './address-copy-button';
+export { MultichainConnectedSiteMenu } from './multichain-connected-site-menu';
diff --git a/ui/components/multichain/multichain-components.scss b/ui/components/multichain/multichain-components.scss
index a2a2dbd20..ea41f990e 100644
--- a/ui/components/multichain/multichain-components.scss
+++ b/ui/components/multichain/multichain-components.scss
@@ -8,4 +8,5 @@
 @import 'account-list-item/index';
 @import 'account-list-menu/index';
 @import 'account-picker/index';
+@import 'multichain-connected-site-menu/index';
 @import 'multichain-token-list-item/multichain-token-list-item';
diff --git a/ui/components/multichain/multichain-connected-site-menu/__snapshots__/multichain-connected-site-menu.test.js.snap b/ui/components/multichain/multichain-connected-site-menu/__snapshots__/multichain-connected-site-menu.test.js.snap
new file mode 100644
index 000000000..876d9d2c3
--- /dev/null
+++ b/ui/components/multichain/multichain-connected-site-menu/__snapshots__/multichain-connected-site-menu.test.js.snap
@@ -0,0 +1,112 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Multichain Connected Site Menu should render the site menu in connected state 1`] = `
+<div>
+  <div
+    class="box multichain-connected-site-menu box--flex-direction-row"
+    data-testid="connection-menu"
+  >
+    <div>
+      <div
+        aria-describedby="tippy-tooltip-1"
+        class=""
+        data-original-title="Account 2 connected"
+        data-tooltipped=""
+        style="display: inline;"
+        tabindex="0"
+      >
+        <div
+          class="box mm-badge-wrapper box--display-inline-block box--flex-direction-row"
+        >
+          <span
+            class="box mm-icon mm-icon--size-lg box--display-inline-block box--flex-direction-row box--color-icon-default"
+            style="mask-image: url('./images/icons/global.svg');"
+          />
+          <div
+            class="box mm-badge-wrapper__badge-container box--flex-direction-row"
+            style="bottom: 2px; right: -4px; z-index: 1;"
+          >
+            <div
+              class="box multichain-connected-site-menu__badge  box--flex-direction-row box--background-color-success-default box--rounded-full box--border-color-background-default box--border-width-3 box--border-style-solid"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Multichain Connected Site Menu should render the site menu in not connected state 1`] = `
+<div>
+  <div
+    class="box multichain-connected-site-menu box--flex-direction-row"
+    data-testid="connection-menu"
+  >
+    <div>
+      <div
+        aria-describedby="tippy-tooltip-2"
+        class=""
+        data-original-title="No accounts connected"
+        data-tooltipped=""
+        style="display: inline;"
+        tabindex="0"
+      >
+        <div
+          class="box mm-badge-wrapper box--display-inline-block box--flex-direction-row"
+        >
+          <span
+            class="box mm-icon mm-icon--size-lg box--display-inline-block box--flex-direction-row box--color-icon-default"
+            style="mask-image: url('./images/icons/global.svg');"
+          />
+          <div
+            class="box mm-badge-wrapper__badge-container box--flex-direction-row"
+            style="bottom: 2px; right: -4px; z-index: 1;"
+          >
+            <div
+              class="box multichain-connected-site-menu__badge  box--flex-direction-row box--background-color-icon-alternative box--rounded-full box--border-color-background-default box--border-width-3 box--border-style-solid"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Multichain Connected Site Menu should render the site menu in not connected to current account state 1`] = `
+<div>
+  <div
+    class="box multichain-connected-site-menu box--flex-direction-row"
+    data-testid="connection-menu"
+  >
+    <div>
+      <div
+        aria-describedby="tippy-tooltip-3"
+        class=""
+        data-original-title="Account 2 not connected"
+        data-tooltipped=""
+        style="display: inline;"
+        tabindex="0"
+      >
+        <div
+          class="box mm-badge-wrapper box--display-inline-block box--flex-direction-row"
+        >
+          <span
+            class="box mm-icon mm-icon--size-lg box--display-inline-block box--flex-direction-row box--color-icon-default"
+            style="mask-image: url('./images/icons/global.svg');"
+          />
+          <div
+            class="box mm-badge-wrapper__badge-container box--flex-direction-row"
+            style="bottom: 4px; right: -1px; z-index: 1;"
+          >
+            <div
+              class="box multichain-connected-site-menu__badge not-connected box--flex-direction-row box--background-color-background-default box--rounded-full box--border-color-success-default box--border-width-2 box--border-style-solid"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/components/multichain/multichain-connected-site-menu/index.js b/ui/components/multichain/multichain-connected-site-menu/index.js
new file mode 100644
index 000000000..a7724dd6b
--- /dev/null
+++ b/ui/components/multichain/multichain-connected-site-menu/index.js
@@ -0,0 +1 @@
+export { MultichainConnectedSiteMenu } from './multichain-connected-site-menu';
diff --git a/ui/components/multichain/multichain-connected-site-menu/index.scss b/ui/components/multichain/multichain-connected-site-menu/index.scss
new file mode 100644
index 000000000..3b7c363c4
--- /dev/null
+++ b/ui/components/multichain/multichain-connected-site-menu/index.scss
@@ -0,0 +1,23 @@
+.multichain-connected-site-menu {
+  &__badge {
+    height: 16px;
+    width: 16px;
+  }
+
+  &__badge.not-connected {
+    height: 10px;
+    width: 10px;
+  }
+
+  &__badge.not-connected::after {
+    content: '';
+    position: absolute;
+    top: -3px;
+    left: -3px;
+    right: -3px;
+    bottom: -3px;
+    background: var(--color-background-default);
+    z-index: -1;
+    border-radius: 50%;
+  }
+}
diff --git a/ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.js b/ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.js
new file mode 100644
index 000000000..23f8076ec
--- /dev/null
+++ b/ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.js
@@ -0,0 +1,98 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { useSelector } from 'react-redux';
+import {
+  STATUS_CONNECTED_TO_ANOTHER_ACCOUNT,
+  STATUS_NOT_CONNECTED,
+} from '../../../helpers/constants/connected-sites';
+import {
+  BackgroundColor,
+  BorderColor,
+  BorderRadius,
+  IconColor,
+  Size,
+} from '../../../helpers/constants/design-system';
+import { BadgeWrapper, Icon, ICON_NAMES } from '../../component-library';
+import Box from '../../ui/box';
+import { getSelectedIdentity } from '../../../selectors';
+import Tooltip from '../../ui/tooltip';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+export const MultichainConnectedSiteMenu = ({
+  className,
+  globalMenuColor,
+  status,
+  text,
+}) => {
+  const t = useI18nContext();
+  const selectedAccount = useSelector(getSelectedIdentity);
+  return (
+    <Box
+      className={classNames('multichain-connected-site-menu', className)}
+      data-testid="connection-menu"
+    >
+      <Tooltip
+        title={
+          status === STATUS_NOT_CONNECTED
+            ? t('statusNotConnectedAccount')
+            : `${selectedAccount?.name} ${text}`
+        }
+        data-testid="multichain-connected-site-menu__tooltip"
+        position="bottom"
+      >
+        <BadgeWrapper
+          positionObj={
+            status === STATUS_CONNECTED_TO_ANOTHER_ACCOUNT
+              ? { bottom: 4, right: -1, zIndex: 1 }
+              : { bottom: 2, right: -4, zIndex: 1 }
+          }
+          badge={
+            <Box
+              backgroundColor={globalMenuColor}
+              className={`multichain-connected-site-menu__badge ${
+                status === STATUS_CONNECTED_TO_ANOTHER_ACCOUNT
+                  ? 'not-connected'
+                  : ''
+              }`}
+              borderRadius={BorderRadius.full}
+              borderColor={
+                status === STATUS_CONNECTED_TO_ANOTHER_ACCOUNT
+                  ? BorderColor.successDefault
+                  : BackgroundColor.backgroundDefault
+              }
+              borderWidth={
+                status === STATUS_CONNECTED_TO_ANOTHER_ACCOUNT ? 2 : 3
+              }
+            />
+          }
+        >
+          <Icon
+            name={ICON_NAMES.GLOBAL}
+            size={Size.LG}
+            color={IconColor.iconDefault}
+          />
+        </BadgeWrapper>
+      </Tooltip>
+    </Box>
+  );
+};
+
+MultichainConnectedSiteMenu.propTypes = {
+  /**
+   * Additional classNames to be added to the MultichainConnectedSiteMenu
+   */
+  className: PropTypes.string,
+  /**
+   * Background color based on the connection status
+   */
+  globalMenuColor: PropTypes.string.isRequired,
+  /**
+   * Connection status string
+   */
+  status: PropTypes.string.isRequired,
+  /**
+   * Connection status message
+   */
+  text: PropTypes.string,
+};
diff --git a/ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.stories.js b/ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.stories.js
new file mode 100644
index 000000000..d959caa3a
--- /dev/null
+++ b/ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.stories.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import {
+  STATUS_CONNECTED,
+  STATUS_CONNECTED_TO_ANOTHER_ACCOUNT,
+  STATUS_NOT_CONNECTED,
+} from '../../../helpers/constants/connected-sites';
+import {
+  BackgroundColor,
+  Color,
+} from '../../../helpers/constants/design-system';
+import { MultichainConnectedSiteMenu } from './multichain-connected-site-menu';
+
+export default {
+  title: 'Components/Multichain/MultichainConnectedSiteMenu',
+  component: MultichainConnectedSiteMenu,
+  argTypes: {
+    globalMenuColor: {
+      control: 'text',
+    },
+    text: {
+      control: 'text',
+    },
+    status: {
+      control: 'text',
+    },
+  },
+  args: {
+    globalMenuColor: Color.iconAlternative,
+    status: STATUS_NOT_CONNECTED,
+  },
+};
+
+const Template = (args) => {
+  return <MultichainConnectedSiteMenu {...args} />;
+};
+
+export const DefaultStory = Template.bind({});
+
+export const ConnectedStory = Template.bind({});
+ConnectedStory.args = {
+  globalMenuColor: Color.successDefault,
+  text: 'connected',
+  status: STATUS_CONNECTED,
+};
+
+export const ConnectedtoAnotherAccountStory = Template.bind({});
+ConnectedtoAnotherAccountStory.args = {
+  globalMenuColor: BackgroundColor.backgroundDefault,
+  text: 'not connected',
+  status: STATUS_CONNECTED_TO_ANOTHER_ACCOUNT,
+};
diff --git a/ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.test.js b/ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.test.js
new file mode 100644
index 000000000..6f2a711e3
--- /dev/null
+++ b/ui/components/multichain/multichain-connected-site-menu/multichain-connected-site-menu.test.js
@@ -0,0 +1,87 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../test/jest';
+import {
+  STATUS_CONNECTED,
+  STATUS_CONNECTED_TO_ANOTHER_ACCOUNT,
+  STATUS_NOT_CONNECTED,
+} from '../../../helpers/constants/connected-sites';
+import {
+  BackgroundColor,
+  Color,
+} from '../../../helpers/constants/design-system';
+import { MultichainConnectedSiteMenu } from './multichain-connected-site-menu';
+
+describe('Multichain Connected Site Menu', () => {
+  const selectedAddress = '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b';
+
+  const identities = {
+    '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+      address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+      name: 'Account 1',
+    },
+    '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': {
+      address: '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b',
+      name: 'Account 2',
+    },
+  };
+
+  const accounts = {
+    '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
+      address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+      balance: '0x0',
+    },
+    '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b': {
+      address: '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b',
+      balance: '0x0',
+    },
+  };
+  const mockStore = {
+    metamask: {
+      selectedAddress,
+      identities,
+      accounts,
+    },
+  };
+  it('should render the site menu in connected state', () => {
+    const props = {
+      globalMenuColor: Color.successDefault,
+      text: 'connected',
+      status: STATUS_CONNECTED,
+    };
+    const store = configureMockStore()(mockStore);
+    const { getByTestId, container } = renderWithProvider(
+      <MultichainConnectedSiteMenu {...props} />,
+      store,
+    );
+    expect(getByTestId('connection-menu')).toBeDefined();
+    expect(container).toMatchSnapshot();
+  });
+  it('should render the site menu in not connected state', () => {
+    const props = {
+      globalMenuColor: Color.iconAlternative,
+      status: STATUS_NOT_CONNECTED,
+    };
+    const store = configureMockStore()(mockStore);
+    const { getByTestId, container } = renderWithProvider(
+      <MultichainConnectedSiteMenu {...props} />,
+      store,
+    );
+    expect(getByTestId('connection-menu')).toBeDefined();
+    expect(container).toMatchSnapshot();
+  });
+  it('should render the site menu in not connected to current account state', () => {
+    const props = {
+      globalMenuColor: BackgroundColor.backgroundDefault,
+      text: 'not connected',
+      status: STATUS_CONNECTED_TO_ANOTHER_ACCOUNT,
+    };
+    const store = configureMockStore()(mockStore);
+    const { getByTestId, container } = renderWithProvider(
+      <MultichainConnectedSiteMenu {...props} />,
+      store,
+    );
+    expect(getByTestId('connection-menu')).toBeDefined();
+    expect(container).toMatchSnapshot();
+  });
+});

From a71a06965ca3a4399a759434ffd0704a6b6528fc Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 31 Mar 2023 12:58:25 -0500
Subject: [PATCH 115/129] UX: Multichain: Network Menu (#18229)

---
 app/_locales/en/messages.json                 |   3 +
 ui/components/multichain/index.js             |   2 +
 .../multichain/multichain-components.scss     |   3 +
 .../network-list-item.test.js.snap            |  41 ++++++
 .../multichain/network-list-item/index.js     |   1 +
 .../multichain/network-list-item/index.scss   |  51 ++++++++
 .../network-list-item/network-list-item.js    | 108 ++++++++++++++++
 .../network-list-item.stories.js              |  67 ++++++++++
 .../network-list-item.test.js                 |  81 ++++++++++++
 .../multichain/network-list-menu/index.js     |   1 +
 .../multichain/network-list-menu/index.scss   |   4 +
 .../network-list-menu/network-list-menu.js    | 122 ++++++++++++++++++
 .../network-list-menu.stories.js              |  58 +++++++++
 .../network-list-menu.test.js                 |  61 +++++++++
 ui/selectors/selectors.js                     |  61 +++++++++
 ui/selectors/selectors.test.js                |  50 +++++++
 16 files changed, 714 insertions(+)
 create mode 100644 ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap
 create mode 100644 ui/components/multichain/network-list-item/index.js
 create mode 100644 ui/components/multichain/network-list-item/index.scss
 create mode 100644 ui/components/multichain/network-list-item/network-list-item.js
 create mode 100644 ui/components/multichain/network-list-item/network-list-item.stories.js
 create mode 100644 ui/components/multichain/network-list-item/network-list-item.test.js
 create mode 100644 ui/components/multichain/network-list-menu/index.js
 create mode 100644 ui/components/multichain/network-list-menu/index.scss
 create mode 100644 ui/components/multichain/network-list-menu/network-list-menu.js
 create mode 100644 ui/components/multichain/network-list-menu/network-list-menu.stories.js
 create mode 100644 ui/components/multichain/network-list-menu/network-list-menu.test.js

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index a14cbc3e1..64fe6aa05 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -2184,6 +2184,9 @@
   "networkIsBusy": {
     "message": "Network is busy. Gas prices are high and estimates are less accurate."
   },
+  "networkMenuHeading": {
+    "message": "Select a network"
+  },
   "networkName": {
     "message": "Network name"
   },
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
index debaef289..a4703b158 100644
--- a/ui/components/multichain/index.js
+++ b/ui/components/multichain/index.js
@@ -8,3 +8,5 @@ export { MultichainImportTokenLink } from './multichain-import-token-link';
 export { MultichainTokenListItem } from './multichain-token-list-item';
 export { AddressCopyButton } from './address-copy-button';
 export { MultichainConnectedSiteMenu } from './multichain-connected-site-menu';
+export { NetworkListItem } from './network-list-item';
+export { NetworkListMenu } from './network-list-menu';
diff --git a/ui/components/multichain/multichain-components.scss b/ui/components/multichain/multichain-components.scss
index ea41f990e..63b19d690 100644
--- a/ui/components/multichain/multichain-components.scss
+++ b/ui/components/multichain/multichain-components.scss
@@ -9,4 +9,7 @@
 @import 'account-list-menu/index';
 @import 'account-picker/index';
 @import 'multichain-connected-site-menu/index';
+@import 'account-list-menu/';
 @import 'multichain-token-list-item/multichain-token-list-item';
+@import 'network-list-item/';
+@import 'network-list-menu/';
diff --git a/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap b/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap
new file mode 100644
index 000000000..f71dd7605
--- /dev/null
+++ b/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap
@@ -0,0 +1,41 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NetworkListItem renders properly 1`] = `
+<div>
+  <div
+    class="box multichain-network-list-item box--padding-4 box--gap-2 box--flex-direction-row box--justify-content-space-between box--align-items-center box--width-full box--background-color-transparent box--display-flex"
+  >
+    <div
+      class="box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-network mm-text--body-sm mm-text--text-transform-uppercase box--display-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-background-alternative box--rounded-full box--border-color-transparent box--border-style-solid box--border-width-1"
+    >
+      <img
+        alt="Polygon logo"
+        class="mm-avatar-network__network-image"
+        src="./images/matic-token.png"
+      />
+    </div>
+    <div
+      class="box multichain-network-list-item__network-name box--flex-direction-row"
+    >
+      <button
+        class="box mm-text mm-button-base mm-button-base--ellipsis mm-button-link mm-button-link--size-auto mm-text--body-md mm-text--ellipsis box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-text-default box--background-color-transparent"
+      >
+        <span
+          class="box mm-text mm-text--inherit mm-text--ellipsis box--flex-direction-row box--color-text-default"
+        >
+          Polygon
+        </span>
+      </button>
+    </div>
+    <button
+      aria-label="[deleteNetwork]"
+      class="box mm-button-icon mm-button-icon--size-sm multichain-network-list-item__delete box--display-inline-flex box--flex-direction-row box--justify-content-center box--align-items-center box--color-error-default box--background-color-transparent box--rounded-lg"
+    >
+      <span
+        class="box mm-icon mm-icon--size-sm box--display-inline-block box--flex-direction-row box--color-inherit"
+        style="mask-image: url('./images/icons/trash.svg');"
+      />
+    </button>
+  </div>
+</div>
+`;
diff --git a/ui/components/multichain/network-list-item/index.js b/ui/components/multichain/network-list-item/index.js
new file mode 100644
index 000000000..7fc23e245
--- /dev/null
+++ b/ui/components/multichain/network-list-item/index.js
@@ -0,0 +1 @@
+export { NetworkListItem } from './network-list-item';
diff --git a/ui/components/multichain/network-list-item/index.scss b/ui/components/multichain/network-list-item/index.scss
new file mode 100644
index 000000000..a7a1e6aa1
--- /dev/null
+++ b/ui/components/multichain/network-list-item/index.scss
@@ -0,0 +1,51 @@
+.multichain-network-list-item {
+  position: relative;
+  cursor: pointer;
+
+  &:not(.multichain-network-list-item--selected) {
+    &:hover,
+    &:focus-within {
+      background: var(--color-background-default-hover);
+    }
+  }
+
+  a:hover,
+  a:focus {
+    color: inherit;
+  }
+
+  &:hover,
+  &:focus,
+  &:focus-within {
+    .multichain-network-list-item__delete {
+      visibility: visible;
+    }
+  }
+
+  &__network-name {
+    width: 100%;
+    flex: 1;
+    overflow: hidden;
+    text-align: start;
+
+    button:hover {
+      opacity: 1;
+    }
+  }
+
+  &__tooltip {
+    display: inline;
+  }
+
+  &__selected-indicator {
+    width: 4px;
+    height: calc(100% - 8px);
+    position: absolute;
+    top: 4px;
+    left: 4px;
+  }
+
+  &__delete {
+    visibility: hidden;
+  }
+}
diff --git a/ui/components/multichain/network-list-item/network-list-item.js b/ui/components/multichain/network-list-item/network-list-item.js
new file mode 100644
index 000000000..02f030e83
--- /dev/null
+++ b/ui/components/multichain/network-list-item/network-list-item.js
@@ -0,0 +1,108 @@
+import React from 'react';
+import classnames from 'classnames';
+import PropTypes from 'prop-types';
+import Box from '../../ui/box/box';
+import {
+  AlignItems,
+  IconColor,
+  BorderRadius,
+  Color,
+  Size,
+  JustifyContent,
+  TextColor,
+  BLOCK_SIZES,
+} from '../../../helpers/constants/design-system';
+import {
+  AvatarNetwork,
+  ButtonIcon,
+  ButtonLink,
+  ICON_NAMES,
+} from '../../component-library';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import Tooltip from '../../ui/tooltip/tooltip';
+
+const MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP = 17;
+
+export const NetworkListItem = ({
+  name,
+  iconSrc,
+  selected = false,
+  onClick,
+  onDeleteClick,
+}) => {
+  const t = useI18nContext();
+  return (
+    <Box
+      onClick={onClick}
+      padding={4}
+      gap={2}
+      backgroundColor={selected ? Color.primaryMuted : Color.transparent}
+      className={classnames('multichain-network-list-item', {
+        'multichain-network-list-item--selected': selected,
+      })}
+      alignItems={AlignItems.center}
+      justifyContent={JustifyContent.spaceBetween}
+      width={BLOCK_SIZES.FULL}
+    >
+      {selected && (
+        <Box
+          className="multichain-network-list-item__selected-indicator"
+          borderRadius={BorderRadius.pill}
+          backgroundColor={Color.primaryDefault}
+        />
+      )}
+      <AvatarNetwork name={name} src={iconSrc} />
+      <Box className="multichain-network-list-item__network-name">
+        <ButtonLink onClick={onClick} color={TextColor.textDefault} ellipsis>
+          {name.length > MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP ? (
+            <Tooltip
+              title={name}
+              position="bottom"
+              wrapperClassName="multichain-network-list-item__tooltip"
+            >
+              {name}
+            </Tooltip>
+          ) : (
+            name
+          )}
+        </ButtonLink>
+      </Box>
+      {onDeleteClick ? (
+        <ButtonIcon
+          className="multichain-network-list-item__delete"
+          color={IconColor.errorDefault}
+          iconName={ICON_NAMES.TRASH}
+          ariaLabel={t('deleteNetwork')}
+          size={Size.SM}
+          onClick={(e) => {
+            e.stopPropagation();
+            onDeleteClick();
+          }}
+        />
+      ) : null}
+    </Box>
+  );
+};
+
+NetworkListItem.propTypes = {
+  /**
+   * The name of the network
+   */
+  name: PropTypes.string.isRequired,
+  /**
+   * Path to the Icon image
+   */
+  iconSrc: PropTypes.string,
+  /**
+   * Represents if the network item is selected
+   */
+  selected: PropTypes.bool,
+  /**
+   * Executes when the item is clicked
+   */
+  onClick: PropTypes.func.isRequired,
+  /**
+   * Executes when the delete icon is clicked
+   */
+  onDeleteClick: PropTypes.func,
+};
diff --git a/ui/components/multichain/network-list-item/network-list-item.stories.js b/ui/components/multichain/network-list-item/network-list-item.stories.js
new file mode 100644
index 000000000..51b15f982
--- /dev/null
+++ b/ui/components/multichain/network-list-item/network-list-item.stories.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import { NetworkListItem } from '.';
+
+export default {
+  title: 'Components/Multichain/NetworkListItem',
+  component: NetworkListItem,
+  argTypes: {
+    name: {
+      control: 'text',
+    },
+    selected: {
+      control: 'boolean',
+    },
+    onClick: {
+      action: 'onClick',
+    },
+    onDeleteClick: {
+      action: 'onDeleteClick',
+    },
+    iconSrc: {
+      action: 'text',
+    },
+  },
+  args: {
+    name: 'Ethereum',
+    iconSrc: '',
+    selected: false,
+  },
+};
+
+export const DefaultStory = (args) => (
+  <div
+    style={{ width: '328px', border: '1px solid var(--color-border-muted)' }}
+  >
+    <NetworkListItem {...args} />
+  </div>
+);
+
+export const IconStory = (args) => (
+  <div
+    style={{ width: '328px', border: '1px solid var(--color-border-muted)' }}
+  >
+    <NetworkListItem {...args} />
+  </div>
+);
+IconStory.args = { iconSrc: './images/matic-token.png', name: 'Polygon' };
+
+export const SelectedStory = (args) => (
+  <div
+    style={{ width: '328px', border: '1px solid var(--color-border-muted)' }}
+  >
+    <NetworkListItem {...args} />
+  </div>
+);
+SelectedStory.args = { selected: true };
+
+export const ChaosStory = (args) => (
+  <div
+    style={{ width: '328px', border: '1px solid var(--color-border-muted)' }}
+  >
+    <NetworkListItem {...args} />
+  </div>
+);
+ChaosStory.args = {
+  name: 'This is a super long network name that should be ellipsized',
+  selected: true,
+};
diff --git a/ui/components/multichain/network-list-item/network-list-item.test.js b/ui/components/multichain/network-list-item/network-list-item.test.js
new file mode 100644
index 000000000..4c4215d02
--- /dev/null
+++ b/ui/components/multichain/network-list-item/network-list-item.test.js
@@ -0,0 +1,81 @@
+/* eslint-disable jest/require-top-level-describe */
+import React from 'react';
+import { fireEvent, render } from '@testing-library/react';
+import {
+  MATIC_TOKEN_IMAGE_URL,
+  POLYGON_DISPLAY_NAME,
+} from '../../../../shared/constants/network';
+import { NetworkListItem } from '.';
+
+const DEFAULT_PROPS = {
+  name: POLYGON_DISPLAY_NAME,
+  iconSrc: MATIC_TOKEN_IMAGE_URL,
+  selected: false,
+  onClick: () => undefined,
+  onDeleteClick: () => undefined,
+};
+
+describe('NetworkListItem', () => {
+  it('renders properly', () => {
+    const { container } = render(<NetworkListItem {...DEFAULT_PROPS} />);
+    expect(container).toMatchSnapshot();
+  });
+
+  it('does not render the delete icon when no onDeleteClick is clicked', () => {
+    const { container } = render(
+      <NetworkListItem {...DEFAULT_PROPS} onDeleteClick={null} />,
+    );
+    expect(
+      container.querySelector('.multichain-network-list-item__delete'),
+    ).toBeNull();
+  });
+
+  it('shows as selected when selected', () => {
+    const { container } = render(
+      <NetworkListItem {...DEFAULT_PROPS} selected />,
+    );
+    expect(
+      container.querySelector(
+        '.multichain-network-list-item__selected-indicator',
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('renders a tooltip when the network name is very long', () => {
+    const { container } = render(
+      <NetworkListItem
+        {...DEFAULT_PROPS}
+        name="This is a very long network name that will be truncated"
+      />,
+    );
+    expect(
+      container.querySelector('.multichain-network-list-item__tooltip'),
+    ).toBeInTheDocument();
+  });
+
+  it('executes onClick when the item is clicked', () => {
+    const onClick = jest.fn();
+    const { container } = render(
+      <NetworkListItem {...DEFAULT_PROPS} onClick={onClick} />,
+    );
+    fireEvent.click(container.querySelector('.multichain-network-list-item'));
+    expect(onClick).toHaveBeenCalled();
+  });
+
+  it('executes onDeleteClick when the delete button is clicked', () => {
+    const onDeleteClick = jest.fn();
+    const onClick = jest.fn();
+    const { container } = render(
+      <NetworkListItem
+        {...DEFAULT_PROPS}
+        onDeleteClick={onDeleteClick}
+        onClick={onClick}
+      />,
+    );
+    fireEvent.click(
+      container.querySelector('.multichain-network-list-item__delete'),
+    );
+    expect(onDeleteClick).toHaveBeenCalledTimes(1);
+    expect(onClick).toHaveBeenCalledTimes(0);
+  });
+});
diff --git a/ui/components/multichain/network-list-menu/index.js b/ui/components/multichain/network-list-menu/index.js
new file mode 100644
index 000000000..6e11c426a
--- /dev/null
+++ b/ui/components/multichain/network-list-menu/index.js
@@ -0,0 +1 @@
+export { NetworkListMenu } from './network-list-menu';
diff --git a/ui/components/multichain/network-list-menu/index.scss b/ui/components/multichain/network-list-menu/index.scss
new file mode 100644
index 000000000..fbd2ed7ba
--- /dev/null
+++ b/ui/components/multichain/network-list-menu/index.scss
@@ -0,0 +1,4 @@
+.multichain-network-list-menu {
+  max-height: 200px;
+  overflow: auto;
+}
diff --git a/ui/components/multichain/network-list-menu/network-list-menu.js b/ui/components/multichain/network-list-menu/network-list-menu.js
new file mode 100644
index 000000000..0cf1818ca
--- /dev/null
+++ b/ui/components/multichain/network-list-menu/network-list-menu.js
@@ -0,0 +1,122 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import Popover from '../../ui/popover/popover.component';
+import { NetworkListItem } from '../network-list-item';
+import {
+  setActiveNetwork,
+  showModal,
+  setShowTestNetworks,
+  setProviderType,
+} from '../../../store/actions';
+import { CHAIN_IDS, TEST_CHAINS } from '../../../../shared/constants/network';
+import {
+  getShowTestNetworks,
+  getAllNetworks,
+  getCurrentChainId,
+} from '../../../selectors';
+import Box from '../../ui/box/box';
+import ToggleButton from '../../ui/toggle-button';
+import {
+  DISPLAY,
+  JustifyContent,
+} from '../../../helpers/constants/design-system';
+import { Button, BUTTON_TYPES, Text } from '../../component-library';
+import { ADD_POPULAR_CUSTOM_NETWORK } from '../../../helpers/constants/routes';
+import { getEnvironmentType } from '../../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
+
+const UNREMOVABLE_CHAIN_IDS = [CHAIN_IDS.MAINNET, ...TEST_CHAINS];
+
+export const NetworkListMenu = ({ closeMenu }) => {
+  const t = useI18nContext();
+  const networks = useSelector(getAllNetworks);
+  const showTestNetworks = useSelector(getShowTestNetworks);
+  const currentChainId = useSelector(getCurrentChainId);
+  const dispatch = useDispatch();
+  const history = useHistory();
+
+  const environmentType = getEnvironmentType();
+  const isFullScreen = environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
+
+  return (
+    <Popover onClose={closeMenu} centerTitle title={t('networkMenuHeading')}>
+      <>
+        <Box className="multichain-network-list-menu">
+          {networks.map((network) => {
+            const isCurrentNetwork = currentChainId === network.chainId;
+            const canDeleteNetwork =
+              !isCurrentNetwork &&
+              !UNREMOVABLE_CHAIN_IDS.includes(network.chainId);
+
+            return (
+              <NetworkListItem
+                name={network.nickname}
+                iconSrc={network?.rpcPrefs?.imageUrl}
+                key={network.id || network.chainId}
+                selected={isCurrentNetwork}
+                onClick={() => {
+                  if (network.providerType) {
+                    dispatch(setProviderType(network.providerType));
+                  } else {
+                    dispatch(setActiveNetwork(network.id));
+                  }
+                  closeMenu();
+                }}
+                onDeleteClick={
+                  canDeleteNetwork
+                    ? () => {
+                        dispatch(
+                          showModal({
+                            name: 'CONFIRM_DELETE_NETWORK',
+                            target: network.id || network.chainId,
+                            onConfirm: () => undefined,
+                          }),
+                        );
+                        closeMenu();
+                      }
+                    : null
+                }
+              />
+            );
+          })}
+        </Box>
+        <Box
+          padding={4}
+          display={DISPLAY.FLEX}
+          justifyContent={JustifyContent.spaceBetween}
+        >
+          <Text>{t('showTestnetNetworks')}</Text>
+          <ToggleButton
+            value={showTestNetworks}
+            onToggle={(value) => dispatch(setShowTestNetworks(!value))}
+          />
+        </Box>
+        <Box padding={4}>
+          <Button
+            type={BUTTON_TYPES.SECONDARY}
+            block
+            onClick={() => {
+              isFullScreen
+                ? history.push(ADD_POPULAR_CUSTOM_NETWORK)
+                : global.platform.openExtensionInBrowser(
+                    ADD_POPULAR_CUSTOM_NETWORK,
+                  );
+            }}
+          >
+            {t('addNetwork')}
+          </Button>
+        </Box>
+      </>
+    </Popover>
+  );
+};
+
+NetworkListMenu.propTypes = {
+  /**
+   * Executes when the menu should be closed
+   */
+  closeMenu: PropTypes.func.isRequired,
+};
diff --git a/ui/components/multichain/network-list-menu/network-list-menu.stories.js b/ui/components/multichain/network-list-menu/network-list-menu.stories.js
new file mode 100644
index 000000000..0629cd8e6
--- /dev/null
+++ b/ui/components/multichain/network-list-menu/network-list-menu.stories.js
@@ -0,0 +1,58 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import testData from '../../../../.storybook/test-data';
+import configureStore from '../../../store/store';
+import {
+  OPTIMISM_DISPLAY_NAME,
+  CHAIN_IDS,
+  OPTIMISM_TOKEN_IMAGE_URL,
+  BSC_DISPLAY_NAME,
+  BNB_TOKEN_IMAGE_URL,
+} from '../../../../shared/constants/network';
+import { NetworkListMenu } from '.';
+
+const customNetworkStore = configureStore({
+  ...testData,
+  metamask: {
+    ...testData.metamask,
+    preferences: {
+      showTestNetworks: true,
+    },
+    networkConfigurations: {
+      ...testData.metamask.networkConfigurations,
+      ...{
+        'test-networkConfigurationId-3': {
+          rpcUrl: 'https://testrpc.com',
+          chainId: CHAIN_IDS.OPTIMISM,
+          nickname: OPTIMISM_DISPLAY_NAME,
+          rpcPrefs: { imageUrl: OPTIMISM_TOKEN_IMAGE_URL },
+        },
+        'test-networkConfigurationId-4': {
+          rpcUrl: 'https://testrpc.com',
+          chainId: CHAIN_IDS.BSC,
+          nickname: BSC_DISPLAY_NAME,
+          rpcPrefs: { imageUrl: BNB_TOKEN_IMAGE_URL },
+        },
+      },
+    },
+  },
+});
+
+export default {
+  title: 'Components/Multichain/NetworkListMenu',
+  component: NetworkListMenu,
+  argTypes: {
+    closeMenu: {
+      action: 'closeMenu',
+    },
+  },
+};
+
+export const DefaultStory = (args) => <NetworkListMenu {...args} />;
+DefaultStory.decorators = [
+  (Story) => (
+    <Provider store={customNetworkStore}>
+      <Story />
+    </Provider>
+  ),
+];
diff --git a/ui/components/multichain/network-list-menu/network-list-menu.test.js b/ui/components/multichain/network-list-menu/network-list-menu.test.js
new file mode 100644
index 000000000..e87876f39
--- /dev/null
+++ b/ui/components/multichain/network-list-menu/network-list-menu.test.js
@@ -0,0 +1,61 @@
+/* eslint-disable jest/require-top-level-describe */
+import React from 'react';
+import { fireEvent, renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import {
+  MAINNET_DISPLAY_NAME,
+  SEPOLIA_DISPLAY_NAME,
+} from '../../../../shared/constants/network';
+import { NetworkListMenu } from '.';
+
+const mockSetShowTestNetworks = jest.fn();
+const mockSetProviderType = jest.fn();
+jest.mock('../../../store/actions.ts', () => ({
+  setShowTestNetworks: () => mockSetShowTestNetworks,
+  setProviderType: () => mockSetProviderType,
+}));
+
+const render = (showTestNetworks = false) => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+      preferences: {
+        showTestNetworks,
+      },
+    },
+  });
+  return renderWithProvider(<NetworkListMenu closeMenu={jest.fn()} />, store);
+};
+
+describe('NetworkListMenu', () => {
+  it('displays important controls', () => {
+    const { getByText } = render();
+
+    expect(getByText('Add network')).toBeInTheDocument();
+    expect(getByText('Show test networks')).toBeInTheDocument();
+  });
+
+  it('renders mainnet item', () => {
+    const { getByText } = render();
+    expect(getByText(MAINNET_DISPLAY_NAME)).toBeInTheDocument();
+  });
+
+  it('renders test networks when it should', () => {
+    const { getByText } = render(true);
+    expect(getByText(SEPOLIA_DISPLAY_NAME)).toBeInTheDocument();
+  });
+
+  it('toggles showTestNetworks when toggle is clicked', () => {
+    const { queryAllByRole } = render();
+    const [testNetworkToggle] = queryAllByRole('checkbox');
+    fireEvent.click(testNetworkToggle);
+    expect(mockSetShowTestNetworks).toHaveBeenCalled();
+  });
+
+  it('switches networks when an item is clicked', () => {
+    const { getByText } = render();
+    fireEvent.click(getByText(MAINNET_DISPLAY_NAME));
+    expect(mockSetProviderType).toHaveBeenCalled();
+  });
+});
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index be2ced685..7c07865be 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -25,6 +25,10 @@ import {
   CHAIN_IDS,
   NETWORK_TYPES,
   NetworkStatus,
+  SEPOLIA_DISPLAY_NAME,
+  GOERLI_DISPLAY_NAME,
+  ETH_TOKEN_IMAGE_URL,
+  LINEA_TESTNET_DISPLAY_NAME,
 } from '../../shared/constants/network';
 import {
   WebHIDConnectedStatuses,
@@ -1116,6 +1120,63 @@ export function getNetworkConfigurations(state) {
   return state.metamask.networkConfigurations;
 }
 
+export function getAllNetworks(state) {
+  const networkConfigurations = getNetworkConfigurations(state) || {};
+  const showTestnetNetworks = getShowTestNetworks(state);
+  const localhostFilter = (network) => network.chainId === CHAIN_IDS.LOCALHOST;
+
+  const networks = [];
+  // Mainnet always first
+  networks.push({
+    chainId: CHAIN_IDS.MAINNET,
+    nickname: MAINNET_DISPLAY_NAME,
+    rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.MAINNET],
+    rpcPrefs: {
+      imageUrl: ETH_TOKEN_IMAGE_URL,
+    },
+    providerType: NETWORK_TYPES.MAINNET,
+  });
+  // Custom networks added
+  networks.push(
+    ...Object.entries(networkConfigurations)
+      .filter(
+        ([, network]) =>
+          !localhostFilter(network) && network.chainId !== CHAIN_IDS.MAINNET,
+      )
+      .map(([, network]) => network),
+  );
+  // Test networks if flag is on
+  if (showTestnetNetworks) {
+    networks.push(
+      ...[
+        {
+          chainId: CHAIN_IDS.GOERLI,
+          nickname: GOERLI_DISPLAY_NAME,
+          rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.GOERLI],
+          providerType: NETWORK_TYPES.GOERLI,
+        },
+        {
+          chainId: CHAIN_IDS.SEPOLIA,
+          nickname: SEPOLIA_DISPLAY_NAME,
+          rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.SEPOLIA],
+          providerType: NETWORK_TYPES.SEPOLIA,
+        },
+        {
+          chainId: CHAIN_IDS.LINEA_TESTNET,
+          nickname: LINEA_TESTNET_DISPLAY_NAME,
+          rpcUrl: CHAIN_ID_TO_RPC_URL_MAP[CHAIN_IDS.LINEA_TESTNET],
+          provderType: NETWORK_TYPES.LINEA_TESTNET,
+        },
+      ], // Localhosts
+      ...Object.entries(networkConfigurations)
+        .filter(([, network]) => localhostFilter(network))
+        .map(([, network]) => network),
+    );
+  }
+
+  return networks;
+}
+
 export function getIsOptimism(state) {
   return (
     getCurrentChainId(state) === CHAIN_IDS.OPTIMISM ||
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index f1f7bfe5e..edd495ec8 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -1,5 +1,10 @@
 import mockState from '../../test/data/mock-state.json';
 import { KeyringType } from '../../shared/constants/keyring';
+import {
+  CHAIN_IDS,
+  LOCALHOST_DISPLAY_NAME,
+  MAINNET_DISPLAY_NAME,
+} from '../../shared/constants/network';
 import * as selectors from './selectors';
 
 describe('Selectors', () => {
@@ -103,6 +108,51 @@ describe('Selectors', () => {
     });
   });
 
+  describe('#getAllNetworks', () => {
+    it('returns an array even if there are no custom networks', () => {
+      const networks = selectors.getAllNetworks({
+        metamask: {
+          preferences: {
+            showTestNetworks: false,
+          },
+        },
+      });
+      expect(networks instanceof Array).toBe(true);
+      // The only returning item should be Ethereum Mainnet
+      expect(networks).toHaveLength(1);
+      expect(networks[0].nickname).toStrictEqual(MAINNET_DISPLAY_NAME);
+    });
+
+    it('returns more test networks with showTestNetworks on', () => {
+      const networks = selectors.getAllNetworks({
+        metamask: {
+          preferences: {
+            showTestNetworks: true,
+          },
+        },
+      });
+      expect(networks.length).toBeGreaterThan(1);
+    });
+
+    it('sorts Localhost to the bottom of the test lists', () => {
+      const networks = selectors.getAllNetworks({
+        metamask: {
+          preferences: {
+            showTestNetworks: true,
+          },
+          networkConfigurations: {
+            'some-config-name': {
+              chainId: CHAIN_IDS.LOCALHOST,
+              nickname: LOCALHOST_DISPLAY_NAME,
+            },
+          },
+        },
+      });
+      const lastItem = networks.pop();
+      expect(lastItem.nickname.toLowerCase()).toContain('localhost');
+    });
+  });
+
   describe('#isHardwareWallet', () => {
     it('returns false if it is not a HW wallet', () => {
       mockState.metamask.keyrings[0].type = KeyringType.imported;

From 1722f248d24c7223ac54584baa34b1e89872a238 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 3 Apr 2023 03:17:45 -0700
Subject: [PATCH 116/129] Make validate-changelog-in-rc.sh executable (#18402)

---
 .circleci/scripts/validate-changelog-in-rc.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .circleci/scripts/validate-changelog-in-rc.sh

diff --git a/.circleci/scripts/validate-changelog-in-rc.sh b/.circleci/scripts/validate-changelog-in-rc.sh
old mode 100644
new mode 100755

From 50767dd1936699a576289242d02a6bd5edbf77c3 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 3 Apr 2023 03:41:06 -0700
Subject: [PATCH 117/129] =?UTF-8?q?Ensure=20that=20firefox=20linting=20of?=
 =?UTF-8?q?=20beta=20builds=20only=20happens=20on=20beta=20build=E2=80=A6?=
 =?UTF-8?q?=20(#18403)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Ensure that firefox linting of beta builds only happens on beta build commits

* Fix script
---
 .circleci/config.yml                   | 11 +++--------
 .circleci/scripts/mozilla-lint-beta.sh | 27 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 .circleci/scripts/mozilla-lint-beta.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f17e666e8..f4f84e8d1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1157,14 +1157,9 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: Move beta build to dist
-          command: mv ./dist-beta ./dist
-      - run:
-          name: Move beta zips to builds
-          command: mv ./builds-beta ./builds
-      - run:
-          name: test:mozilla-lint
-          command: NODE_OPTIONS=--max_old_space_size=3072 yarn mozilla-lint
+          name: Lint beta for firefox
+          command: |
+            .circleci/scripts/mozilla-lint-beta.sh
 
   test-mozilla-lint-desktop:
     executor: node-browsers
diff --git a/.circleci/scripts/mozilla-lint-beta.sh b/.circleci/scripts/mozilla-lint-beta.sh
new file mode 100644
index 000000000..1096526b7
--- /dev/null
+++ b/.circleci/scripts/mozilla-lint-beta.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+current_commit_msg=$(git show -s --format='%s' HEAD)
+
+if [[ $current_commit_msg =~ Version[[:space:]](v[[:digit:]]+.[[:digit:]]+.[[:digit:]]+[-]beta.[[:digit:]]) ]]
+then
+    # filter the commit message like Version v10.24.1-beta.1
+    printf '%s\n' "Linting beta builds for firefox"
+    # Move beta build to dist
+    mv ./dist-beta ./dist
+    # Move beta zips to builds
+    mv ./builds-beta ./builds
+    # test:mozilla-lint
+    export NODE_OPTIONS='--max_old_space_size=3072'
+    yarn mozilla-lint
+else
+    printf '%s\n' 'Commit message does not match commit message for beta pattern; skipping linting for firefox'
+    mkdir dist
+    mkdir builds
+    exit 0
+fi
+
+exit 0

From 720b7016348eb885f58bb529ade6dc092426f4cb Mon Sep 17 00:00:00 2001
From: Peter <53189696+PeterYinusa@users.noreply.github.com>
Date: Mon, 3 Apr 2023 12:27:52 +0100
Subject: [PATCH 118/129] Make mozilla-lint-beta.sh executable (#18412)

---
 .circleci/scripts/mozilla-lint-beta.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .circleci/scripts/mozilla-lint-beta.sh

diff --git a/.circleci/scripts/mozilla-lint-beta.sh b/.circleci/scripts/mozilla-lint-beta.sh
old mode 100644
new mode 100755

From 3cc53a11b607c9c3c17c7531100e204cf7abc75e Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Mon, 3 Apr 2023 18:05:38 +0400
Subject: [PATCH 119/129] Fix in opensea message (#18413)

* Fix in opensea message

* Further copy changes

---------

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 app/_locales/en/messages.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 64fe6aa05..ef7e9ef0d 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -2446,10 +2446,10 @@
     "message": "The Ethereum Merge is here!"
   },
   "notifications16ActionText": {
-    "message": "Enable security provider"
+    "message": "Enable security alerts"
   },
   "notifications16DescriptionOne": {
-    "message": "Get warnings from OpenSea whenever you receive a known malicious request.",
+    "message": "Get alerts from third parties when you may have received a malicious request.",
     "description": "Description of a notification in the 'See What's New' popup. Describes Opensea Security Provider feature."
   },
   "notifications16DescriptionThree": {
@@ -2457,11 +2457,11 @@
     "description": "Description of a notification in the 'See What's New' popup. Describes Opensea Security Provider feature."
   },
   "notifications16DescriptionTwo": {
-    "message": "OpenSea is the first security provider for this feature. More providers coming soon!",
+    "message": "OpenSea is the first provider for this feature. More providers coming soon!",
     "description": "Description of a notification in the 'See What's New' popup. Describes Opensea Security Provider feature."
   },
   "notifications16Title": {
-    "message": "Stay safe with OpenSea"
+    "message": "Stay safe with security alerts"
   },
   "notifications17ActionText": {
     "message": "Enable NFT autodetection"

From 18a304199cf576d45eaec26734e823d164acc832 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 3 Apr 2023 12:42:24 -0230
Subject: [PATCH 120/129] Skip generating LavaMoat policy for MMI (#18416)

The MMI build type is still a work in progress, and should not be
expected to build successfully yet, so we haven't committed a LavaMoat
policy to the repository for it yet. The policy update script has been
updated to skip MMI by default for now; we can include it after that
build has reached a point where we are confident it will build
successfully.
---
 development/generate-lavamoat-policies.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/development/generate-lavamoat-policies.js b/development/generate-lavamoat-policies.js
index a4004e0b8..9266091b7 100755
--- a/development/generate-lavamoat-policies.js
+++ b/development/generate-lavamoat-policies.js
@@ -4,6 +4,11 @@ const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
 const { BuildType } = require('./lib/build-type');
 
+const stableBuildTypes = Object.values(BuildType).filter(
+  // Skip generating policy for MMI until that build has stabilized
+  (buildType) => buildType !== BuildType.mmi,
+);
+
 start().catch((error) => {
   console.error('Policy generation failed.', error);
   process.exitCode = 1;
@@ -20,7 +25,7 @@ async function start() {
         .option('build-types', {
           alias: ['t'],
           choices: Object.values(BuildType),
-          default: Object.values(BuildType),
+          default: stableBuildTypes,
           demandOption: true,
           description: 'The build type(s) to generate policy files for.',
         })

From 1304ec7af5ff49a63e01274d8c8651cfbcd9a661 Mon Sep 17 00:00:00 2001
From: Elliot Winkler <elliot.winkler@gmail.com>
Date: Mon, 3 Apr 2023 09:31:04 -0600
Subject: [PATCH 121/129] Convert shared/constants/metametrics to TS (#18353)

We want to convert NetworkController to TypeScript in order to be able
to compare differences in the controller between in this repo and the
core repo. To do this, however, we need to convert the dependencies of
the controller to TypeScript.

As a part of this effort, this commit converts
`shared/constants/metametrics` to TypeScript. Note that simple objects
have been largely replaced with enums. There are some cases where I even
split up some of these objects into multiple enums.

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 app/scripts/background.js                     |  24 +-
 app/scripts/controllers/detect-tokens.js      |   9 +-
 app/scripts/controllers/metametrics.js        |  50 +-
 app/scripts/controllers/metametrics.test.js   |  46 +-
 .../controllers/network/network-controller.js |   4 +-
 .../network/network-controller.test.js        |  28 +-
 app/scripts/controllers/sign.test.ts          |   4 +-
 app/scripts/controllers/sign.ts               |   4 +-
 app/scripts/controllers/transactions/index.js |  14 +-
 .../controllers/transactions/index.test.js    |  41 +-
 .../lib/createRPCMethodTrackingMiddleware.js  |  76 +--
 .../createRPCMethodTrackingMiddleware.test.js |  40 +-
 app/scripts/lib/decrypt-message-manager.js    |   4 +-
 .../lib/encryption-public-key-manager.js      |   4 +-
 .../handlers/add-ethereum-chain.js            |   4 +-
 .../handlers/log-web3-shim-usage.js           |   4 +-
 app/scripts/metamask-controller.js            |  23 +-
 shared/constants/metametrics.js               | 482 -------------
 shared/constants/metametrics.ts               | 642 ++++++++++++++++++
 .../account-menu/account-menu.component.js    |  41 +-
 ui/components/app/add-network/add-network.js  |   5 +-
 .../app/app-header/app-header.component.js    |  13 +-
 .../app/asset-list-item/asset-list-item.js    |   4 +-
 ui/components/app/asset-list/asset-list.js    |   9 +-
 .../detected-tokens-link.js                   |  11 +-
 .../confirm-page-container.component.js       |   9 +-
 .../desktop-enable-button.component.js        |   6 +-
 .../detected-token-selection-popover.js       |  11 +-
 .../app/detected-token/detected-token.js      |  19 +-
 .../app/dropdowns/network-dropdown.js         |  12 +-
 .../import-token-link.component.js            |   9 +-
 .../app/menu-bar/account-options-menu.js      |  24 +-
 ui/components/app/menu-bar/menu-bar.js        |   9 +-
 .../account-details-modal.component.js        |  18 +-
 .../confirm-remove-account.component.js       |   4 +-
 .../export-private-key-modal.component.js     |  35 +-
 .../permission-page-container.component.js    |   4 +-
 .../signature-request.component.js            |   6 +-
 .../transaction-activity-log.component.js     |   4 +-
 ...transaction-list-item-details.component.js |  10 +-
 .../transaction-list-item.component.js        |   6 +-
 .../app/wallet-overview/eth-overview.js       |  31 +-
 .../app/wallet-overview/token-overview.js     |  31 +-
 .../account-list-item-menu.js                 |  16 +-
 .../account-list-menu/account-list-menu.js    |  28 +-
 .../detected-token-banner.js                  |  12 +-
 .../multichain/global-menu/global-menu.js     |  34 +-
 .../multichain-import-token-link.js           |   9 +-
 ui/contexts/metametrics.js                    |   7 +-
 ui/ducks/swaps/swaps.js                       |  12 +-
 ui/pages/add-nft/add-nft.js                   |   9 +-
 ui/pages/asset/components/native-asset.js     |   4 +-
 ui/pages/asset/components/token-asset.js      |   4 +-
 .../confirm-add-suggested-token.js            |  12 +-
 .../confirm-decrypt-message.component.js      |   8 +-
 ...confirm-encryption-public-key.component.js |   6 +-
 .../confirm-import-token.js                   |  14 +-
 .../confirm-transaction-base.component.js     |   8 +-
 .../connect-hardware/account-list.js          |   4 +-
 .../create-account/connect-hardware/index.js  |  18 +-
 .../connect-hardware/select-hardware.js       |  30 +-
 .../import-account/import-account.js          |  19 +-
 .../create-account/new-account.component.js   |  18 +-
 .../desktop-error/render-desktop-error.js     |   4 +-
 ui/pages/error/error.component.js             |  14 +-
 .../home/beta/beta-home-footer.component.js   |  14 +-
 .../home/flask/flask-home-footer.component.js |  14 +-
 ui/pages/home/home.component.js               |  12 +-
 ui/pages/keychains/restore-vault.js           |   4 +-
 ui/pages/keychains/reveal-seed.js             |  36 +-
 .../create-password/create-password.js        |   9 +-
 .../creation-successful.js                    |   9 +-
 .../onboarding-flow/import-srp/import-srp.js  |  10 +-
 .../metametrics/metametrics.js                |  14 +-
 ui/pages/onboarding-flow/onboarding-flow.js   |  11 +-
 .../pin-extension/pin-extension.js            |   9 +-
 .../privacy-settings/privacy-settings.js      |   9 +-
 .../confirm-recovery-phrase.js                |  10 +-
 .../recovery-phrase/review-recovery-phrase.js |  14 +-
 .../secure-your-wallet/secure-your-wallet.js  |  17 +-
 .../skip-srp-backup-popover.js                |  15 +-
 ui/pages/onboarding-flow/welcome/welcome.js   |  17 +-
 ui/pages/send/gas-display/gas-display.js      |   9 +-
 .../amount-max-button/amount-max-button.js    |   4 +-
 .../send-asset-row.component.js               |   4 +-
 .../send/send-footer/send-footer.component.js |   6 +-
 ui/pages/send/send.js                         |   4 +-
 .../advanced-tab/advanced-tab.component.js    |   9 +-
 .../experimental-tab.component.js             |   8 +-
 .../settings/info-tab/info-tab.component.js   |  22 +-
 .../networks-form/networks-form.js            |   6 +-
 .../security-tab/security-tab.component.js    |  22 +-
 .../settings-tab/settings-tab.component.js    |   4 +-
 .../awaiting-signatures.js                    |   4 +-
 ui/pages/swaps/awaiting-swap/awaiting-swap.js |  16 +-
 ui/pages/swaps/build-quote/build-quote.js     |  16 +-
 .../swaps/create-new-swap/create-new-swap.js  |   4 +-
 .../dropdown-search-list.js                   |   6 +-
 ui/pages/swaps/fee-card/fee-card.js           |   4 +-
 ui/pages/swaps/index.js                       |   6 +-
 .../loading-swaps-quotes.js                   |   4 +-
 .../item-list/item-list.component.js          |   4 +-
 .../smart-transaction-status.js               |   6 +-
 .../view-on-block-explorer.js                 |  12 +-
 ui/pages/swaps/view-quote/view-quote.js       |  12 +-
 ui/pages/unlock-page/unlock-page.component.js |  20 +-
 ui/store/action-queue/index.ts                |   9 +-
 ui/store/actions.test.js                      |   6 +-
 ui/store/actions.ts                           |   4 +-
 109 files changed, 1462 insertions(+), 1117 deletions(-)
 delete mode 100644 shared/constants/metametrics.js
 create mode 100644 shared/constants/metametrics.ts

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 2fdca5a16..9e7f65d0d 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -24,11 +24,11 @@ import {
 } from '../../shared/constants/app';
 import { SECOND } from '../../shared/constants/time';
 import {
-  REJECT_NOTFICIATION_CLOSE,
-  REJECT_NOTFICIATION_CLOSE_SIG,
-  EVENT,
-  EVENT_NAMES,
-  TRAITS,
+  REJECT_NOTIFICATION_CLOSE,
+  REJECT_NOTIFICATION_CLOSE_SIG,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsUserTrait,
 } from '../../shared/constants/metametrics';
 import { checkForLastErrorAndLog } from '../../shared/modules/browser-runtime.utils';
 import { isManifestV3 } from '../../shared/modules/mv3.utils';
@@ -738,13 +738,13 @@ export function setupController(initState, initLangCode, overrides) {
     ).forEach((txId) =>
       controller.txController.txStateManager.setTxStatusRejected(txId),
     );
-    controller.signController.rejectUnapproved(REJECT_NOTFICIATION_CLOSE_SIG);
+    controller.signController.rejectUnapproved(REJECT_NOTIFICATION_CLOSE_SIG);
     controller.decryptMessageManager.messages
       .filter((msg) => msg.status === 'unapproved')
       .forEach((tx) =>
         controller.decryptMessageManager.rejectMsg(
           tx.id,
-          REJECT_NOTFICIATION_CLOSE,
+          REJECT_NOTIFICATION_CLOSE,
         ),
       );
     controller.encryptionPublicKeyManager.messages
@@ -752,7 +752,7 @@ export function setupController(initState, initLangCode, overrides) {
       .forEach((tx) =>
         controller.encryptionPublicKeyManager.rejectMsg(
           tx.id,
-          REJECT_NOTFICIATION_CLOSE,
+          REJECT_NOTIFICATION_CLOSE,
         ),
       );
 
@@ -848,11 +848,13 @@ async function openPopup() {
 const addAppInstalledEvent = () => {
   if (controller) {
     controller.metaMetricsController.updateTraits({
-      [TRAITS.INSTALL_DATE_EXT]: new Date().toISOString().split('T')[0], // yyyy-mm-dd
+      [MetaMetricsUserTrait.InstallDateExt]: new Date()
+        .toISOString()
+        .split('T')[0], // yyyy-mm-dd
     });
     controller.metaMetricsController.addEventBeforeMetricsOptIn({
-      category: EVENT.CATEGORIES.APP,
-      event: EVENT_NAMES.APP_INSTALLED,
+      category: MetaMetricsEventCategory.App,
+      event: MetaMetricsEventName.AppInstalled,
       properties: {},
     });
     return;
diff --git a/app/scripts/controllers/detect-tokens.js b/app/scripts/controllers/detect-tokens.js
index a53bee096..2b23dd71b 100644
--- a/app/scripts/controllers/detect-tokens.js
+++ b/app/scripts/controllers/detect-tokens.js
@@ -8,7 +8,10 @@ import {
   AssetType,
   TokenStandard,
 } from '../../../shared/constants/transaction';
-import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../shared/constants/metametrics';
 
 // By default, poll every 3 minutes
 const DEFAULT_INTERVAL = MINUTE * 3;
@@ -167,8 +170,8 @@ export default class DetectTokensController {
 
         if (tokensWithBalance.length > 0) {
           this._trackMetaMetricsEvent({
-            event: EVENT_NAMES.TOKEN_DETECTED,
-            category: EVENT.CATEGORIES.WALLET,
+            event: MetaMetricsEventName.TokenDetected,
+            category: MetaMetricsEventCategory.Wallet,
             properties: {
               tokens: eventTokensDetails,
               token_standard: TokenStandard.ERC20,
diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index a949f3cc7..c433b3f5e 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -15,7 +15,7 @@ import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../shared/constants/app';
 import {
   METAMETRICS_ANONYMOUS_ID,
   METAMETRICS_BACKGROUND_PAGE_OBJECT,
-  TRAITS,
+  MetaMetricsUserTrait,
 } from '../../../shared/constants/metametrics';
 import { SECOND } from '../../../shared/constants/time';
 import { isManifestV3 } from '../../../shared/modules/mv3.utils';
@@ -692,38 +692,44 @@ export default class MetaMetricsController {
     const { traits, previousUserTraits } = this.store.getState();
     /** @type {MetaMetricsTraits} */
     const currentTraits = {
-      [TRAITS.ADDRESS_BOOK_ENTRIES]: sum(
+      [MetaMetricsUserTrait.AddressBookEntries]: sum(
         Object.values(metamaskState.addressBook).map(size),
       ),
-      [TRAITS.INSTALL_DATE_EXT]: traits[TRAITS.INSTALL_DATE_EXT] || '',
-      [TRAITS.LEDGER_CONNECTION_TYPE]: metamaskState.ledgerTransportType,
-      [TRAITS.NETWORKS_ADDED]: Object.values(
+      [MetaMetricsUserTrait.InstallDateExt]:
+        traits[MetaMetricsUserTrait.InstallDateExt] || '',
+      [MetaMetricsUserTrait.LedgerConnectionType]:
+        metamaskState.ledgerTransportType,
+      [MetaMetricsUserTrait.NetworksAdded]: Object.values(
         metamaskState.networkConfigurations,
       ).map((networkConfiguration) => networkConfiguration.chainId),
-      [TRAITS.NETWORKS_WITHOUT_TICKER]: Object.values(
+      [MetaMetricsUserTrait.NetworksWithoutTicker]: Object.values(
         metamaskState.networkConfigurations,
       )
         .filter(({ ticker }) => !ticker)
         .map(({ chainId }) => chainId),
-      [TRAITS.NFT_AUTODETECTION_ENABLED]: metamaskState.useNftDetection,
-      [TRAITS.NUMBER_OF_ACCOUNTS]: Object.values(metamaskState.identities)
-        .length,
-      [TRAITS.NUMBER_OF_NFT_COLLECTIONS]: this._getAllUniqueNFTAddressesLength(
+      [MetaMetricsUserTrait.NftAutodetectionEnabled]:
+        metamaskState.useNftDetection,
+      [MetaMetricsUserTrait.NumberOfAccounts]: Object.values(
+        metamaskState.identities,
+      ).length,
+      [MetaMetricsUserTrait.NumberOfNftCollections]:
+        this._getAllUniqueNFTAddressesLength(metamaskState.allNfts),
+      [MetaMetricsUserTrait.NumberOfNfts]: this._getAllNFTsFlattened(
         metamaskState.allNfts,
-      ),
-      [TRAITS.NUMBER_OF_NFTS]: this._getAllNFTsFlattened(metamaskState.allNfts)
-        .length,
-      [TRAITS.NUMBER_OF_TOKENS]: this._getNumberOfTokens(metamaskState),
-      [TRAITS.OPENSEA_API_ENABLED]: metamaskState.openSeaEnabled,
-      [TRAITS.THREE_BOX_ENABLED]: false, // deprecated, hard-coded as false
-      [TRAITS.THEME]: metamaskState.theme || 'default',
-      [TRAITS.TOKEN_DETECTION_ENABLED]: metamaskState.useTokenDetection,
+      ).length,
+      [MetaMetricsUserTrait.NumberOfTokens]:
+        this._getNumberOfTokens(metamaskState),
+      [MetaMetricsUserTrait.OpenseaApiEnabled]: metamaskState.openSeaEnabled,
+      [MetaMetricsUserTrait.ThreeBoxEnabled]: false, // deprecated, hard-coded as false
+      [MetaMetricsUserTrait.Theme]: metamaskState.theme || 'default',
+      [MetaMetricsUserTrait.TokenDetectionEnabled]:
+        metamaskState.useTokenDetection,
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
-      [TRAITS.DESKTOP_ENABLED]: metamaskState.desktopEnabled || false,
+      [MetaMetricsUserTrait.DesktopEnabled]:
+        metamaskState.desktopEnabled || false,
       ///: END:ONLY_INCLUDE_IN
-      [TRAITS.SECURITY_PROVIDERS]: metamaskState.transactionSecurityCheckEnabled
-        ? ['opensea']
-        : [],
+      [MetaMetricsUserTrait.SecurityProviders]:
+        metamaskState.transactionSecurityCheckEnabled ? ['opensea'] : [],
     };
 
     if (!previousUserTraits) {
diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js
index 18535c1d7..dbd0e56c8 100644
--- a/app/scripts/controllers/metametrics.test.js
+++ b/app/scripts/controllers/metametrics.test.js
@@ -5,7 +5,7 @@ import { createSegmentMock } from '../lib/segment';
 import {
   METAMETRICS_ANONYMOUS_ID,
   METAMETRICS_BACKGROUND_PAGE_OBJECT,
-  TRAITS,
+  MetaMetricsUserTrait,
 } from '../../../shared/constants/metametrics';
 import waitUntilCalled from '../../../test/lib/wait-until-called';
 import {
@@ -953,22 +953,26 @@ describe('MetaMetricsController', function () {
       });
 
       assert.deepEqual(traits, {
-        [TRAITS.ADDRESS_BOOK_ENTRIES]: 3,
-        [TRAITS.INSTALL_DATE_EXT]: '',
-        [TRAITS.LEDGER_CONNECTION_TYPE]: 'web-hid',
-        [TRAITS.NETWORKS_ADDED]: [CHAIN_IDS.MAINNET, CHAIN_IDS.GOERLI, '0xaf'],
-        [TRAITS.NETWORKS_WITHOUT_TICKER]: ['0xaf'],
-        [TRAITS.NFT_AUTODETECTION_ENABLED]: false,
-        [TRAITS.NUMBER_OF_ACCOUNTS]: 2,
-        [TRAITS.NUMBER_OF_NFT_COLLECTIONS]: 3,
-        [TRAITS.NUMBER_OF_NFTS]: 4,
-        [TRAITS.NUMBER_OF_TOKENS]: 5,
-        [TRAITS.OPENSEA_API_ENABLED]: true,
-        [TRAITS.THREE_BOX_ENABLED]: false,
-        [TRAITS.THEME]: 'default',
-        [TRAITS.TOKEN_DETECTION_ENABLED]: true,
-        [TRAITS.DESKTOP_ENABLED]: false,
-        [TRAITS.SECURITY_PROVIDERS]: [],
+        [MetaMetricsUserTrait.AddressBookEntries]: 3,
+        [MetaMetricsUserTrait.InstallDateExt]: '',
+        [MetaMetricsUserTrait.LedgerConnectionType]: 'web-hid',
+        [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.DesktopEnabled]: false,
+        [MetaMetricsUserTrait.SecurityProviders]: [],
       });
     });
 
@@ -1015,10 +1019,10 @@ describe('MetaMetricsController', function () {
       });
 
       assert.deepEqual(updatedTraits, {
-        [TRAITS.ADDRESS_BOOK_ENTRIES]: 4,
-        [TRAITS.NUMBER_OF_ACCOUNTS]: 3,
-        [TRAITS.NUMBER_OF_TOKENS]: 1,
-        [TRAITS.OPENSEA_API_ENABLED]: false,
+        [MetaMetricsUserTrait.AddressBookEntries]: 4,
+        [MetaMetricsUserTrait.NumberOfAccounts]: 3,
+        [MetaMetricsUserTrait.NumberOfTokens]: 1,
+        [MetaMetricsUserTrait.OpenseaApiEnabled]: false,
       });
     });
 
diff --git a/app/scripts/controllers/network/network-controller.js b/app/scripts/controllers/network/network-controller.js
index ca48d85c4..ad8ded74b 100644
--- a/app/scripts/controllers/network/network-controller.js
+++ b/app/scripts/controllers/network/network-controller.js
@@ -26,7 +26,7 @@ import {
   isPrefixedFormattedHexString,
   isSafeChainId,
 } from '../../../../shared/modules/network.utils';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { createNetworkClient } from './create-network-client';
 
 /**
@@ -645,7 +645,7 @@ export default class NetworkController extends EventEmitter {
     if (!oldNetworkConfigurationId) {
       this._trackMetaMetricsEvent({
         event: 'Custom Network Added',
-        category: EVENT.CATEGORIES.NETWORK,
+        category: MetaMetricsEventCategory.Network,
         referrer: {
           url: referrer,
         },
diff --git a/app/scripts/controllers/network/network-controller.test.js b/app/scripts/controllers/network/network-controller.test.js
index e8684179e..a58c563a8 100644
--- a/app/scripts/controllers/network/network-controller.test.js
+++ b/app/scripts/controllers/network/network-controller.test.js
@@ -5,7 +5,7 @@ import nock from 'nock';
 import sinon from 'sinon';
 import { ControllerMessenger } from '@metamask/base-controller';
 import { BUILT_IN_NETWORKS } from '../../../../shared/constants/network';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsNetworkEventSource } from '../../../../shared/constants/metametrics';
 import NetworkController from './network-controller';
 
 jest.mock('uuid', () => {
@@ -6991,7 +6991,7 @@ describe('NetworkController', () => {
             },
             {
               referrer: 'https://test-dapp.com',
-              source: EVENT.SOURCE.NETWORK.DAPP,
+              source: MetaMetricsNetworkEventSource.Dapp,
             },
           ),
         ).toThrow(
@@ -7015,7 +7015,7 @@ describe('NetworkController', () => {
             },
             {
               referrer: 'https://test-dapp.com',
-              source: EVENT.SOURCE.NETWORK.DAPP,
+              source: MetaMetricsNetworkEventSource.Dapp,
             },
           ),
         ).toThrow(
@@ -7038,7 +7038,7 @@ describe('NetworkController', () => {
             },
             {
               referrer: 'https://test-dapp.com',
-              source: EVENT.SOURCE.NETWORK.DAPP,
+              source: MetaMetricsNetworkEventSource.Dapp,
             },
           ),
         ).toThrow(
@@ -7062,7 +7062,7 @@ describe('NetworkController', () => {
             },
             {
               referrer: 'https://test-dapp.com',
-              source: EVENT.SOURCE.NETWORK.DAPP,
+              source: MetaMetricsNetworkEventSource.Dapp,
             },
           ),
         ).toThrow(new Error('rpcUrl must be a valid URL'));
@@ -7081,7 +7081,7 @@ describe('NetworkController', () => {
             },
             {
               referrer: 'https://test-dapp.com',
-              source: EVENT.SOURCE.NETWORK.DAPP,
+              source: MetaMetricsNetworkEventSource.Dapp,
             },
           ),
         ).toThrow(
@@ -7126,7 +7126,7 @@ describe('NetworkController', () => {
 
           controller.upsertNetworkConfiguration(rpcUrlNetwork, {
             referrer: 'https://test-dapp.com',
-            source: EVENT.SOURCE.NETWORK.DAPP,
+            source: MetaMetricsNetworkEventSource.Dapp,
           });
 
           expect(
@@ -7164,7 +7164,7 @@ describe('NetworkController', () => {
 
           controller.upsertNetworkConfiguration(rpcUrlNetwork, {
             referrer: 'https://test-dapp.com',
-            source: EVENT.SOURCE.NETWORK.DAPP,
+            source: MetaMetricsNetworkEventSource.Dapp,
           });
 
           expect(
@@ -7213,7 +7213,7 @@ describe('NetworkController', () => {
 
           controller.upsertNetworkConfiguration(rpcUrlNetwork, {
             referrer: 'https://test-dapp.com',
-            source: EVENT.SOURCE.NETWORK.DAPP,
+            source: MetaMetricsNetworkEventSource.Dapp,
           });
 
           expect(
@@ -7262,7 +7262,7 @@ describe('NetworkController', () => {
           };
           controller.upsertNetworkConfiguration(updatedConfiguration, {
             referrer: 'https://test-dapp.com',
-            source: EVENT.SOURCE.NETWORK.DAPP,
+            source: MetaMetricsNetworkEventSource.Dapp,
           });
           expect(
             Object.values(controller.store.getState().networkConfigurations),
@@ -7315,7 +7315,7 @@ describe('NetworkController', () => {
             },
             {
               referrer: 'https://test-dapp.com',
-              source: EVENT.SOURCE.NETWORK.DAPP,
+              source: MetaMetricsNetworkEventSource.Dapp,
             },
           );
 
@@ -7375,7 +7375,7 @@ describe('NetworkController', () => {
 
           controller.upsertNetworkConfiguration(rpcUrlNetwork, {
             referrer: 'https://test-dapp.com',
-            source: EVENT.SOURCE.NETWORK.DAPP,
+            source: MetaMetricsNetworkEventSource.Dapp,
           });
 
           expect(controller.store.getState().provider).toStrictEqual(
@@ -7424,7 +7424,7 @@ describe('NetworkController', () => {
           controller.upsertNetworkConfiguration(rpcUrlNetwork, {
             setActive: true,
             referrer: 'https://test-dapp.com',
-            source: EVENT.SOURCE.NETWORK.DAPP,
+            source: MetaMetricsNetworkEventSource.Dapp,
           });
 
           expect(controller.store.getState().provider).toStrictEqual({
@@ -7473,7 +7473,7 @@ describe('NetworkController', () => {
 
           controller.upsertNetworkConfiguration(newNetworkConfiguration, {
             referrer: 'https://test-dapp.com',
-            source: EVENT.SOURCE.NETWORK.DAPP,
+            source: MetaMetricsNetworkEventSource.Dapp,
           });
 
           expect(
diff --git a/app/scripts/controllers/sign.test.ts b/app/scripts/controllers/sign.test.ts
index 9363583fb..7212df2ae 100644
--- a/app/scripts/controllers/sign.test.ts
+++ b/app/scripts/controllers/sign.test.ts
@@ -7,7 +7,7 @@ import {
   AbstractMessage,
   OriginalRequest,
 } from '@metamask/message-manager/dist/AbstractMessageManager';
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import { detectSIWE } from '../../../shared/modules/siwe';
 import SignController, {
   SignControllerMessenger,
@@ -270,7 +270,7 @@ describe('SignController', () => {
       expect(metricsEventMock).toHaveBeenCalledTimes(6);
       expect(metricsEventMock).toHaveBeenLastCalledWith({
         event: 'Test Reason',
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         properties: {
           action: 'Sign Request',
           type: messageMock.type,
diff --git a/app/scripts/controllers/sign.ts b/app/scripts/controllers/sign.ts
index 13157d502..afaeaa499 100644
--- a/app/scripts/controllers/sign.ts
+++ b/app/scripts/controllers/sign.ts
@@ -32,7 +32,7 @@ import {
   AddApprovalRequest,
   RejectRequest,
 } from '@metamask/approval-controller';
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import { detectSIWE } from '../../../shared/modules/siwe';
 import PreferencesController from './preferences';
 
@@ -510,7 +510,7 @@ export default class SignController extends BaseControllerV2<
 
       this._metricsEvent({
         event: reason,
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         properties: {
           action: 'Sign Request',
           type: message.type,
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index a98ee441d..8d0cddd6e 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -39,7 +39,7 @@ import {
   hexWEIToDecGWEI,
 } from '../../../../shared/modules/conversion.utils';
 import { isSwapsDefaultTokenAddress } from '../../../../shared/modules/swaps.utils';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import {
   HARDFORKS,
   CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP,
@@ -2027,7 +2027,7 @@ export default class TransactionController extends EventEmitter {
         this._trackMetaMetricsEvent({
           event: 'Swap Failed',
           sensitiveProperties: { ...txMeta.swapMetaData },
-          category: EVENT.CATEGORIES.SWAPS,
+          category: MetaMetricsEventCategory.Swaps,
         });
       } else {
         const tokensReceived = getSwapsTokensReceivedFromTxMeta(
@@ -2062,7 +2062,7 @@ export default class TransactionController extends EventEmitter {
 
         this._trackMetaMetricsEvent({
           event: 'Swap Completed',
-          category: EVENT.CATEGORIES.SWAPS,
+          category: MetaMetricsEventCategory.Swaps,
           sensitiveProperties: {
             ...txMeta.swapMetaData,
             token_to_amount_received: tokensReceived,
@@ -2414,7 +2414,7 @@ export default class TransactionController extends EventEmitter {
       // occur.
       case TransactionMetaMetricsEvent.added:
         this.createEventFragment({
-          category: EVENT.CATEGORIES.TRANSACTIONS,
+          category: MetaMetricsEventCategory.Transactions,
           initialEvent: TransactionMetaMetricsEvent.added,
           successEvent: TransactionMetaMetricsEvent.approved,
           failureEvent: TransactionMetaMetricsEvent.rejected,
@@ -2436,7 +2436,7 @@ export default class TransactionController extends EventEmitter {
       case TransactionMetaMetricsEvent.approved:
       case TransactionMetaMetricsEvent.rejected:
         this.createEventFragment({
-          category: EVENT.CATEGORIES.TRANSACTIONS,
+          category: MetaMetricsEventCategory.Transactions,
           successEvent: TransactionMetaMetricsEvent.approved,
           failureEvent: TransactionMetaMetricsEvent.rejected,
           properties,
@@ -2458,7 +2458,7 @@ export default class TransactionController extends EventEmitter {
       // properties to the transaction event.
       case TransactionMetaMetricsEvent.submitted:
         this.createEventFragment({
-          category: EVENT.CATEGORIES.TRANSACTIONS,
+          category: MetaMetricsEventCategory.Transactions,
           initialEvent: TransactionMetaMetricsEvent.submitted,
           successEvent: TransactionMetaMetricsEvent.finalized,
           properties,
@@ -2478,7 +2478,7 @@ export default class TransactionController extends EventEmitter {
       // fragment does not exist.
       case TransactionMetaMetricsEvent.finalized:
         this.createEventFragment({
-          category: EVENT.CATEGORIES.TRANSACTIONS,
+          category: MetaMetricsEventCategory.Transactions,
           successEvent: TransactionMetaMetricsEvent.finalized,
           properties,
           sensitiveProperties,
diff --git a/app/scripts/controllers/transactions/index.test.js b/app/scripts/controllers/transactions/index.test.js
index 99b2cd4b1..c16f1fa2c 100644
--- a/app/scripts/controllers/transactions/index.test.js
+++ b/app/scripts/controllers/transactions/index.test.js
@@ -10,7 +10,10 @@ import {
   getTestAccounts,
 } from '../../../../test/stub/provider';
 import mockEstimates from '../../../../test/data/mock-estimates.json';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsTransactionEventSource,
+} from '../../../../shared/constants/metametrics';
 import {
   TransactionStatus,
   TransactionType,
@@ -1772,7 +1775,7 @@ describe('Transaction Controller', function () {
           successEvent: 'Transaction Approved',
           failureEvent: 'Transaction Rejected',
           uniqueIdentifier: 'transaction-added-1',
-          category: EVENT.CATEGORIES.TRANSACTIONS,
+          category: MetaMetricsEventCategory.Transactions,
           persist: true,
           properties: {
             chain_id: '0x5',
@@ -1781,7 +1784,7 @@ describe('Transaction Controller', function () {
             gas_edit_type: 'none',
             network: '5',
             referrer: ORIGIN_METAMASK,
-            source: EVENT.SOURCE.TRANSACTION.USER,
+            source: MetaMetricsTransactionEventSource.User,
             transaction_type: TransactionType.simpleSend,
             account_type: 'MetaMask',
             asset_type: AssetType.native,
@@ -1859,7 +1862,7 @@ describe('Transaction Controller', function () {
           initialEvent: 'Transaction Submitted',
           successEvent: 'Transaction Finalized',
           uniqueIdentifier: 'transaction-submitted-1',
-          category: EVENT.CATEGORIES.TRANSACTIONS,
+          category: MetaMetricsEventCategory.Transactions,
           persist: true,
           properties: {
             chain_id: '0x5',
@@ -1868,7 +1871,7 @@ describe('Transaction Controller', function () {
             gas_edit_type: 'none',
             network: '5',
             referrer: ORIGIN_METAMASK,
-            source: EVENT.SOURCE.TRANSACTION.USER,
+            source: MetaMetricsTransactionEventSource.User,
             transaction_type: TransactionType.simpleSend,
             account_type: 'MetaMask',
             asset_type: AssetType.native,
@@ -1958,7 +1961,7 @@ describe('Transaction Controller', function () {
           successEvent: 'Transaction Approved',
           failureEvent: 'Transaction Rejected',
           uniqueIdentifier: 'transaction-added-1',
-          category: EVENT.CATEGORIES.TRANSACTIONS,
+          category: MetaMetricsEventCategory.Transactions,
           persist: true,
           properties: {
             chain_id: '0x5',
@@ -1967,7 +1970,7 @@ describe('Transaction Controller', function () {
             gas_edit_type: 'none',
             network: '5',
             referrer: 'other',
-            source: EVENT.SOURCE.TRANSACTION.DAPP,
+            source: MetaMetricsTransactionEventSource.Dapp,
             transaction_type: TransactionType.simpleSend,
             account_type: 'MetaMask',
             asset_type: AssetType.native,
@@ -2047,7 +2050,7 @@ describe('Transaction Controller', function () {
           initialEvent: 'Transaction Submitted',
           successEvent: 'Transaction Finalized',
           uniqueIdentifier: 'transaction-submitted-1',
-          category: EVENT.CATEGORIES.TRANSACTIONS,
+          category: MetaMetricsEventCategory.Transactions,
           persist: true,
           properties: {
             chain_id: '0x5',
@@ -2056,7 +2059,7 @@ describe('Transaction Controller', function () {
             gas_edit_type: 'none',
             network: '5',
             referrer: 'other',
-            source: EVENT.SOURCE.TRANSACTION.DAPP,
+            source: MetaMetricsTransactionEventSource.Dapp,
             transaction_type: TransactionType.simpleSend,
             account_type: 'MetaMask',
             asset_type: AssetType.native,
@@ -2138,7 +2141,7 @@ describe('Transaction Controller', function () {
         successEvent: 'Transaction Approved',
         failureEvent: 'Transaction Rejected',
         uniqueIdentifier: 'transaction-added-1',
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         persist: true,
         properties: {
           chain_id: '0x5',
@@ -2147,7 +2150,7 @@ describe('Transaction Controller', function () {
           gas_edit_type: 'none',
           network: '5',
           referrer: 'other',
-          source: EVENT.SOURCE.TRANSACTION.DAPP,
+          source: MetaMetricsTransactionEventSource.Dapp,
           transaction_type: TransactionType.simpleSend,
           account_type: 'MetaMask',
           asset_type: AssetType.native,
@@ -2211,11 +2214,11 @@ describe('Transaction Controller', function () {
         failureEvent: 'Transaction Rejected',
         uniqueIdentifier: 'transaction-added-1',
         persist: true,
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         properties: {
           network: '5',
           referrer: 'other',
-          source: EVENT.SOURCE.TRANSACTION.DAPP,
+          source: MetaMetricsTransactionEventSource.Dapp,
           transaction_type: TransactionType.simpleSend,
           chain_id: '0x5',
           eip_1559_version: '0',
@@ -2285,11 +2288,11 @@ describe('Transaction Controller', function () {
         failureEvent: 'Transaction Rejected',
         uniqueIdentifier: 'transaction-added-1',
         persist: true,
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         properties: {
           network: '5',
           referrer: 'other',
-          source: EVENT.SOURCE.TRANSACTION.DAPP,
+          source: MetaMetricsTransactionEventSource.Dapp,
           transaction_type: TransactionType.simpleSend,
           chain_id: '0x5',
           eip_1559_version: '0',
@@ -2359,11 +2362,11 @@ describe('Transaction Controller', function () {
         failureEvent: 'Transaction Rejected',
         uniqueIdentifier: 'transaction-added-1',
         persist: true,
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         properties: {
           network: '5',
           referrer: 'other',
-          source: EVENT.SOURCE.TRANSACTION.DAPP,
+          source: MetaMetricsTransactionEventSource.Dapp,
           transaction_type: TransactionType.simpleSend,
           chain_id: '0x5',
           eip_1559_version: '0',
@@ -2441,7 +2444,7 @@ describe('Transaction Controller', function () {
         failureEvent: 'Transaction Rejected',
         uniqueIdentifier: 'transaction-added-1',
         persist: true,
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         properties: {
           chain_id: '0x5',
           eip_1559_version: '2',
@@ -2449,7 +2452,7 @@ describe('Transaction Controller', function () {
           gas_edit_type: 'none',
           network: '5',
           referrer: 'other',
-          source: EVENT.SOURCE.TRANSACTION.DAPP,
+          source: MetaMetricsTransactionEventSource.Dapp,
           transaction_type: TransactionType.simpleSend,
           account_type: 'MetaMask',
           asset_type: AssetType.native,
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
index cec5b3308..cd3b9720a 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -4,9 +4,9 @@ import { TransactionStatus } from '../../../shared/constants/transaction';
 import { SECOND } from '../../../shared/constants/time';
 import { detectSIWE } from '../../../shared/modules/siwe';
 import {
-  EVENT,
-  EVENT_NAMES,
-  METAMETRIC_KEY_OPT,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsEventUiCustomization,
 } from '../../../shared/constants/metametrics';
 
 /**
@@ -46,50 +46,50 @@ const RATE_LIMIT_MAP = {
  */
 const EVENT_NAME_MAP = {
   [MESSAGE_TYPE.ETH_SIGN]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    FAILED: EVENT_NAMES.SIGNATURE_FAILED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+    APPROVED: MetaMetricsEventName.SignatureApproved,
+    FAILED: MetaMetricsEventName.SignatureFailed,
+    REJECTED: MetaMetricsEventName.SignatureRejected,
+    REQUESTED: MetaMetricsEventName.SignatureRequested,
   },
   [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+    APPROVED: MetaMetricsEventName.SignatureApproved,
+    REJECTED: MetaMetricsEventName.SignatureRejected,
+    REQUESTED: MetaMetricsEventName.SignatureRequested,
   },
   [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V3]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+    APPROVED: MetaMetricsEventName.SignatureApproved,
+    REJECTED: MetaMetricsEventName.SignatureRejected,
+    REQUESTED: MetaMetricsEventName.SignatureRequested,
   },
   [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+    APPROVED: MetaMetricsEventName.SignatureApproved,
+    REJECTED: MetaMetricsEventName.SignatureRejected,
+    REQUESTED: MetaMetricsEventName.SignatureRequested,
   },
   [MESSAGE_TYPE.PERSONAL_SIGN]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+    APPROVED: MetaMetricsEventName.SignatureApproved,
+    REJECTED: MetaMetricsEventName.SignatureRejected,
+    REQUESTED: MetaMetricsEventName.SignatureRequested,
   },
   [MESSAGE_TYPE.ETH_DECRYPT]: {
-    APPROVED: EVENT_NAMES.DECRYPTION_APPROVED,
-    REJECTED: EVENT_NAMES.DECRYPTION_REJECTED,
-    REQUESTED: EVENT_NAMES.DECRYPTION_REQUESTED,
+    APPROVED: MetaMetricsEventName.DecryptionApproved,
+    REJECTED: MetaMetricsEventName.DecryptionRejected,
+    REQUESTED: MetaMetricsEventName.DecryptionRequested,
   },
   [MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY]: {
-    APPROVED: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_APPROVED,
-    REJECTED: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_REJECTED,
-    REQUESTED: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_REQUESTED,
+    APPROVED: MetaMetricsEventName.EncryptionPublicKeyApproved,
+    REJECTED: MetaMetricsEventName.EncryptionPublicKeyRejected,
+    REQUESTED: MetaMetricsEventName.EncryptionPublicKeyRequested,
   },
   [MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS]: {
-    APPROVED: EVENT_NAMES.PERMISSIONS_APPROVED,
-    REJECTED: EVENT_NAMES.PERMISSIONS_REJECTED,
-    REQUESTED: EVENT_NAMES.PERMISSIONS_REQUESTED,
+    APPROVED: MetaMetricsEventName.PermissionsApproved,
+    REJECTED: MetaMetricsEventName.PermissionsRejected,
+    REQUESTED: MetaMetricsEventName.PermissionsRequested,
   },
   [MESSAGE_TYPE.WALLET_REQUEST_PERMISSIONS]: {
-    APPROVED: EVENT_NAMES.PERMISSIONS_APPROVED,
-    REJECTED: EVENT_NAMES.PERMISSIONS_REJECTED,
-    REQUESTED: EVENT_NAMES.PERMISSIONS_REQUESTED,
+    APPROVED: MetaMetricsEventName.PermissionsApproved,
+    REJECTED: MetaMetricsEventName.PermissionsRejected,
+    REQUESTED: MetaMetricsEventName.PermissionsRequested,
   },
 };
 
@@ -162,9 +162,9 @@ export default function createRPCMethodTrackingMiddleware({
       // 'Provider Method Called'.
       const event = eventType
         ? eventType.REQUESTED
-        : EVENT_NAMES.PROVIDER_METHOD_CALLED;
+        : MetaMetricsEventName.ProviderMethodCalled;
 
-      if (event === EVENT_NAMES.SIGNATURE_REQUESTED) {
+      if (event === MetaMetricsEventName.SignatureRequested) {
         eventProperties.signature_type = method;
 
         const data = req?.params?.[0];
@@ -190,11 +190,11 @@ export default function createRPCMethodTrackingMiddleware({
 
           if (securityProviderResponse?.flagAsDangerous === 1) {
             eventProperties.ui_customizations = [
-              METAMETRIC_KEY_OPT.ui_customizations.flaggedAsMalicious,
+              MetaMetricsEventUiCustomization.FlaggedAsMalicious,
             ];
           } else if (securityProviderResponse?.flagAsDangerous === 2) {
             eventProperties.ui_customizations = [
-              METAMETRIC_KEY_OPT.ui_customizations.flaggedAsSafetyUnknown,
+              MetaMetricsEventUiCustomization.FlaggedAsSafetyUnknown,
             ];
           }
 
@@ -203,7 +203,7 @@ export default function createRPCMethodTrackingMiddleware({
             if (isSIWEMessage) {
               eventProperties.ui_customizations = (
                 eventProperties.ui_customizations || []
-              ).concat(METAMETRIC_KEY_OPT.ui_customizations.SIWE);
+              ).concat(MetaMetricsEventUiCustomization.Siwe);
             }
           }
         } catch (e) {
@@ -217,7 +217,7 @@ export default function createRPCMethodTrackingMiddleware({
 
       trackEvent({
         event,
-        category: EVENT.CATEGORIES.INPAGE_PROVIDER,
+        category: MetaMetricsEventCategory.InpageProvider,
         referrer: {
           url: origin,
         },
@@ -253,7 +253,7 @@ export default function createRPCMethodTrackingMiddleware({
 
       trackEvent({
         event,
-        category: EVENT.CATEGORIES.INPAGE_PROVIDER,
+        category: MetaMetricsEventCategory.InpageProvider,
         referrer: {
           url: origin,
         },
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
index 5be404f43..342fd320a 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
@@ -1,8 +1,8 @@
 import { errorCodes } from 'eth-rpc-errors';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
 import {
-  EVENT_NAMES,
-  METAMETRIC_KEY_OPT,
+  MetaMetricsEventName,
+  MetaMetricsEventUiCustomization,
 } from '../../../shared/constants/metametrics';
 import { SECOND } from '../../../shared/constants/time';
 import { detectSIWE } from '../../../shared/modules/siwe';
@@ -111,7 +111,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       metricsState.participateInMetaMetrics = true;
     });
 
-    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event`, async () => {
+    it(`should immediately track a ${MetaMetricsEventName.SignatureRequested} event`, async () => {
       const req = {
         method: MESSAGE_TYPE.ETH_SIGN,
         origin: 'some.dapp',
@@ -125,7 +125,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       expect(trackEvent).toHaveBeenCalledTimes(1);
       expect(trackEvent.mock.calls[0][0]).toMatchObject({
         category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_REQUESTED,
+        event: MetaMetricsEventName.SignatureRequested,
         properties: {
           signature_type: MESSAGE_TYPE.ETH_SIGN,
         },
@@ -133,7 +133,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       });
     });
 
-    it(`should track a ${EVENT_NAMES.SIGNATURE_APPROVED} event if the user approves`, async () => {
+    it(`should track a ${MetaMetricsEventName.SignatureApproved} event if the user approves`, async () => {
       const req = {
         method: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
         origin: 'some.dapp',
@@ -148,7 +148,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       expect(trackEvent).toHaveBeenCalledTimes(2);
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
         category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_APPROVED,
+        event: MetaMetricsEventName.SignatureApproved,
         properties: {
           signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
         },
@@ -156,7 +156,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       });
     });
 
-    it(`should track a ${EVENT_NAMES.SIGNATURE_REJECTED} event if the user approves`, async () => {
+    it(`should track a ${MetaMetricsEventName.SignatureRejected} event if the user approves`, async () => {
       const req = {
         method: MESSAGE_TYPE.PERSONAL_SIGN,
         origin: 'some.dapp',
@@ -171,7 +171,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       expect(trackEvent).toHaveBeenCalledTimes(2);
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
         category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_REJECTED,
+        event: MetaMetricsEventName.SignatureRejected,
         properties: {
           signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
         },
@@ -179,7 +179,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       });
     });
 
-    it(`should track a ${EVENT_NAMES.PERMISSIONS_APPROVED} event if the user approves`, async () => {
+    it(`should track a ${MetaMetricsEventName.PermissionsApproved} event if the user approves`, async () => {
       const req = {
         method: MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS,
         origin: 'some.dapp',
@@ -192,7 +192,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
       expect(trackEvent).toHaveBeenCalledTimes(2);
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
         category: 'inpage_provider',
-        event: EVENT_NAMES.PERMISSIONS_APPROVED,
+        event: MetaMetricsEventName.PermissionsApproved,
         properties: { method: MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS },
         referrer: { url: 'some.dapp' },
       });
@@ -261,17 +261,17 @@ describe('createRPCMethodTrackingMiddleware', () => {
 
       expect(trackEvent.mock.calls[1][0]).toMatchObject({
         category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_APPROVED,
+        event: MetaMetricsEventName.SignatureApproved,
         properties: {
           signature_type: MESSAGE_TYPE.PERSONAL_SIGN,
-          ui_customizations: [METAMETRIC_KEY_OPT.ui_customizations.SIWE],
+          ui_customizations: [MetaMetricsEventUiCustomization.Siwe],
         },
         referrer: { url: 'some.dapp' },
       });
     });
 
     describe(`when '${MESSAGE_TYPE.ETH_SIGN}' is disabled in advanced settings`, () => {
-      it(`should track ${EVENT_NAMES.SIGNATURE_FAILED} and include error property`, async () => {
+      it(`should track ${MetaMetricsEventName.SignatureFailed} and include error property`, async () => {
         const mockError = { code: errorCodes.rpc.methodNotFound };
         const req = {
           method: MESSAGE_TYPE.ETH_SIGN,
@@ -289,7 +289,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
 
         expect(trackEvent.mock.calls[1][0]).toMatchObject({
           category: 'inpage_provider',
-          event: EVENT_NAMES.SIGNATURE_FAILED,
+          event: MetaMetricsEventName.SignatureFailed,
           properties: {
             signature_type: MESSAGE_TYPE.ETH_SIGN,
             error: mockError,
@@ -300,7 +300,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
     });
 
     describe('when request is flagged as safe by security provider', () => {
-      it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event`, async () => {
+      it(`should immediately track a ${MetaMetricsEventName.SignatureRequested} event`, async () => {
         const req = {
           method: MESSAGE_TYPE.ETH_SIGN,
           origin: 'some.dapp',
@@ -315,7 +315,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         expect(trackEvent).toHaveBeenCalledTimes(1);
         expect(trackEvent.mock.calls[0][0]).toMatchObject({
           category: 'inpage_provider',
-          event: EVENT_NAMES.SIGNATURE_REQUESTED,
+          event: MetaMetricsEventName.SignatureRequested,
           properties: {
             signature_type: MESSAGE_TYPE.ETH_SIGN,
           },
@@ -329,7 +329,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         flagAsDangerous = 1;
       });
 
-      it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as malicious`, async () => {
+      it(`should immediately track a ${MetaMetricsEventName.SignatureRequested} event which is flagged as malicious`, async () => {
         const req = {
           method: MESSAGE_TYPE.ETH_SIGN,
           origin: 'some.dapp',
@@ -344,7 +344,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         expect(trackEvent).toHaveBeenCalledTimes(1);
         expect(trackEvent.mock.calls[0][0]).toMatchObject({
           category: 'inpage_provider',
-          event: EVENT_NAMES.SIGNATURE_REQUESTED,
+          event: MetaMetricsEventName.SignatureRequested,
           properties: {
             signature_type: MESSAGE_TYPE.ETH_SIGN,
             ui_customizations: ['flagged_as_malicious'],
@@ -359,7 +359,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         flagAsDangerous = 2;
       });
 
-      it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event which is flagged as safety unknown`, async () => {
+      it(`should immediately track a ${MetaMetricsEventName.SignatureRequested} event which is flagged as safety unknown`, async () => {
         const req = {
           method: MESSAGE_TYPE.ETH_SIGN,
           origin: 'some.dapp',
@@ -374,7 +374,7 @@ describe('createRPCMethodTrackingMiddleware', () => {
         expect(trackEvent).toHaveBeenCalledTimes(1);
         expect(trackEvent.mock.calls[0][0]).toMatchObject({
           category: 'inpage_provider',
-          event: EVENT_NAMES.SIGNATURE_REQUESTED,
+          event: MetaMetricsEventName.SignatureRequested,
           properties: {
             signature_type: MESSAGE_TYPE.ETH_SIGN,
             ui_customizations: ['flagged_as_safety_unknown'],
diff --git a/app/scripts/lib/decrypt-message-manager.js b/app/scripts/lib/decrypt-message-manager.js
index 197b66763..9249c907e 100644
--- a/app/scripts/lib/decrypt-message-manager.js
+++ b/app/scripts/lib/decrypt-message-manager.js
@@ -4,7 +4,7 @@ import { bufferToHex } from 'ethereumjs-util';
 import { ethErrors } from 'eth-rpc-errors';
 import log from 'loglevel';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import { METAMASK_CONTROLLER_EVENTS } from '../metamask-controller';
 import createId from '../../../shared/modules/random-id';
 import { stripHexPrefix } from '../../../shared/modules/hexstring-utils';
@@ -237,7 +237,7 @@ export default class DecryptMessageManager extends EventEmitter {
     if (reason) {
       this.metricsEvent({
         event: reason,
-        category: EVENT.CATEGORIES.MESSAGES,
+        category: MetaMetricsEventCategory.Messages,
         properties: {
           action: 'Decrypt Message Request',
         },
diff --git a/app/scripts/lib/encryption-public-key-manager.js b/app/scripts/lib/encryption-public-key-manager.js
index 6230c9224..9791e0378 100644
--- a/app/scripts/lib/encryption-public-key-manager.js
+++ b/app/scripts/lib/encryption-public-key-manager.js
@@ -3,7 +3,7 @@ import { ObservableStore } from '@metamask/obs-store';
 import { ethErrors } from 'eth-rpc-errors';
 import log from 'loglevel';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import { METAMASK_CONTROLLER_EVENTS } from '../metamask-controller';
 import createId from '../../../shared/modules/random-id';
 
@@ -225,7 +225,7 @@ export default class EncryptionPublicKeyManager extends EventEmitter {
     if (reason) {
       this.metricsEvent({
         event: reason,
-        category: EVENT.CATEGORIES.MESSAGES,
+        category: MetaMetricsEventCategory.Messages,
         properties: {
           action: 'Encryption public key Request',
         },
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js b/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js
index b35fe1e5c..f63412b61 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js
@@ -9,7 +9,7 @@ import {
   isPrefixedFormattedHexString,
   isSafeChainId,
 } from '../../../../../shared/modules/network.utils';
-import { EVENT } from '../../../../../shared/constants/metametrics';
+import { MetaMetricsNetworkEventSource } from '../../../../../shared/constants/metametrics';
 
 const addEthereumChain = {
   methodNames: [MESSAGE_TYPE.ADD_ETHEREUM_CHAIN],
@@ -262,7 +262,7 @@ async function addEthereumChainHandler(
         rpcUrl: firstValidRPCUrl,
         ticker,
       },
-      { source: EVENT.SOURCE.NETWORK.DAPP, referrer: origin },
+      { source: MetaMetricsNetworkEventSource.Dapp, referrer: origin },
     );
 
     // Once the network has been added, the requested is considered successful
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/log-web3-shim-usage.js b/app/scripts/lib/rpc-method-middleware/handlers/log-web3-shim-usage.js
index b829e16fa..5ea476a4f 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/log-web3-shim-usage.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/log-web3-shim-usage.js
@@ -1,5 +1,5 @@
 import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
-import { EVENT } from '../../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../../shared/constants/metametrics';
 
 /**
  * This RPC method is called by the inpage provider whenever it detects the
@@ -49,7 +49,7 @@ function logWeb3ShimUsageHandler(
     sendMetrics(
       {
         event: `Website Accessed window.web3 Shim`,
-        category: EVENT.CATEGORIES.INPAGE_PROVIDER,
+        category: MetaMetricsEventCategory.InpageProvider,
         referrer: {
           url: origin,
         },
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 93670073d..c1b050b3b 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -104,7 +104,10 @@ import {
   ///: END:ONLY_INCLUDE_IN
   POLLING_TOKEN_ENVIRONMENT_TYPES,
 } from '../../shared/constants/app';
-import { EVENT, EVENT_NAMES } from '../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../shared/constants/metametrics';
 
 import {
   getTokenIdParam,
@@ -399,8 +402,8 @@ export default class MetamaskController extends EventEmitter {
           ),
         onNftAdded: ({ address, symbol, tokenId, standard, source }) =>
           this.metaMetricsController.trackEvent({
-            event: EVENT_NAMES.NFT_ADDED,
-            category: EVENT.CATEGORIES.WALLET,
+            event: MetaMetricsEventName.NftAdded,
+            category: MetaMetricsEventCategory.Wallet,
             properties: {
               token_contract_address: address,
               token_symbol: symbol,
@@ -1069,7 +1072,7 @@ export default class MetamaskController extends EventEmitter {
           this.metaMetricsController.trackEvent(
             {
               event: 'Tx Status Update: On-Chain Failure',
-              category: EVENT.CATEGORIES.BACKGROUND,
+              category: MetaMetricsEventCategory.Background,
               properties: {
                 action: 'Transactions',
                 errorMessage: txMeta.simulationFails?.reason,
@@ -1196,8 +1199,8 @@ export default class MetamaskController extends EventEmitter {
       const { serviceWorkerLastActiveTime } =
         this.appStateController.store.getState();
       const metametricsPayload = {
-        category: EVENT.SOURCE.SERVICE_WORKERS,
-        event: EVENT_NAMES.SERVICE_WORKER_RESTARTED,
+        category: MetaMetricsEventCategory.ServiceWorkers,
+        event: MetaMetricsEventName.ServiceWorkerRestarted,
         properties: {
           service_worker_restarted_time:
             Date.now() - serviceWorkerLastActiveTime,
@@ -1619,7 +1622,7 @@ export default class MetamaskController extends EventEmitter {
       (truncatedSnap) => {
         this.metaMetricsController.trackEvent({
           event: 'Snap Installed',
-          category: EVENT.CATEGORIES.SNAPS,
+          category: MetaMetricsEventCategory.Snaps,
           properties: {
             snap_id: truncatedSnap.id,
             version: truncatedSnap.version,
@@ -1633,7 +1636,7 @@ export default class MetamaskController extends EventEmitter {
       (newSnap, oldVersion) => {
         this.metaMetricsController.trackEvent({
           event: 'Snap Updated',
-          category: EVENT.CATEGORIES.SNAPS,
+          category: MetaMetricsEventCategory.Snaps,
           properties: {
             snap_id: newSnap.id,
             old_version: oldVersion,
@@ -3540,8 +3543,8 @@ export default class MetamaskController extends EventEmitter {
       if (usePhishDetect && phishingTestResponse?.result) {
         this.sendPhishingWarning(connectionStream, hostname);
         this.metaMetricsController.trackEvent({
-          event: EVENT_NAMES.PHISHING_PAGE_DISPLAYED,
-          category: EVENT.CATEGORIES.PHISHING,
+          event: MetaMetricsEventName.PhishingPageDisplayed,
+          category: MetaMetricsEventCategory.Phishing,
           properties: {
             url: hostname,
           },
diff --git a/shared/constants/metametrics.js b/shared/constants/metametrics.js
deleted file mode 100644
index 1eeb0a314..000000000
--- a/shared/constants/metametrics.js
+++ /dev/null
@@ -1,482 +0,0 @@
-// Type Imports
-/**
- * @typedef {import('../../shared/constants/app').EnvironmentType} EnvironmentType
- */
-
-// Type Declarations
-/**
- * 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
- * page events.
- *
- * @typedef {object} MetaMetricsPageObject
- * @property {string} [path] - the path of the current page (e.g /home)
- * @property {string} [title] - the title of the current page (e.g 'home')
- * @property {string} [url] - the fully qualified url of the current page
- */
-
-/**
- * For metamask, this is the dapp that triggered an interaction
- *
- * @typedef {object} MetaMetricsReferrerObject
- * @property {string} [url] - the origin of the dapp issuing the
- *  notification
- */
-
-/**
- * We attach context to every meta metrics event that help to qualify our
- * analytics. This type has all optional values because it represents a
- * returned object from a method call. Ideally app and userAgent are
- * defined on every event. This is confirmed in the getTrackMetaMetricsEvent
- * function, but still provides the consumer a way to override these values if
- * necessary.
- *
- * @typedef {object} MetaMetricsContext
- * @property {object} app - Application metadata.
- * @property {string} app.name - the name of the application tracking the event
- * @property {string} app.version - the version of the application
- * @property {string} userAgent - the useragent string of the user
- * @property {MetaMetricsPageObject} [page] - an object representing details of
- *  the current page
- * @property {MetaMetricsReferrerObject} [referrer] - for metamask, this is the
- *  dapp that triggered an interaction
- */
-
-/**
- * @typedef {object} MetaMetricsEventPayload
- * @property {string} event - event name to track
- * @property {string} category - category to associate event to
- * @property {number} [actionId] - Action id to deduplicate event requests from
- * the UI
- * @property {string} [environmentType] - The type of environment this event
- *  occurred in. Defaults to the background process type
- * @property {object} [properties] - object of custom values to track, keys
- *  in this object must be in snake_case
- * @property {object} [sensitiveProperties] - Object of sensitive values to
- *  track. Keys in this object must be in snake_case. These properties will be
- *  sent in an additional event that excludes the user's metaMetricsId
- * @property {number} [revenue] - amount of currency that event creates in
- *  revenue for MetaMask
- * @property {string} [currency] - ISO 4127 format currency for events with
- *  revenue, defaults to US dollars
- * @property {number} [value] - Abstract business "value" attributable to
- *  customers who trigger this event
- * @property {MetaMetricsPageObject} [page] - the page/route that the event
- *  occurred on
- * @property {MetaMetricsReferrerObject} [referrer] - the origin of the dapp
- *  that triggered the event
- */
-
-/**
- * @typedef {object} MetaMetricsEventOptions
- * @property {boolean} [isOptIn] - happened during opt in/out workflow
- * @property {boolean} [flushImmediately] - When true will automatically flush
- *  the segment queue after tracking the event. Recommended if the result of
- *  tracking the event must be known before UI transition or update
- * @property {boolean} [excludeMetaMetricsId] - whether to exclude the user's
- *  metametrics id for anonymity
- * @property {string} [metaMetricsId] - an override for the metaMetricsId in
- *  the event one is created as part of an asynchronous workflow, such as
- *  awaiting the result of the metametrics opt-in function that generates the
- *  user's metametrics id
- * @property {boolean} [matomoEvent] - is this event a holdover from matomo
- *  that needs further migration? when true, sends the data to a special
- *  segment source that marks the event data as not conforming to our schema
- */
-
-/**
- * @typedef {object} MetaMetricsEventFragment
- * @property {string} successEvent - The event name to fire when the fragment
- *  is closed in an affirmative action.
- * @property {string} [failureEvent] - The event name to fire when the fragment
- *  is closed with a rejection.
- * @property {string} [initialEvent] - An event name to fire immediately upon
- *  fragment creation. This is useful for building funnels in mixpanel and for
- *  reduction of code duplication.
- * @property {string} category - the event category to use for both the success
- *  and failure events
- * @property {boolean} [persist] - Should this fragment be persisted in
- *  state and progressed after the extension is locked and unlocked.
- * @property {number} [timeout] - Time in seconds the event should be persisted
- *  for. After the timeout the fragment will be closed as abandoned. if not
- *  supplied the fragment is stored indefinitely.
- * @property {number} [lastUpdated] - Date.now() when the fragment was last
- *  updated. Used to determine if the timeout has expired and the fragment
- *  should be closed.
- * @property {object} [properties] - Object of custom values to track, keys in
- *  this object must be in snake_case.
- * @property {object} [sensitiveProperties] - Object of sensitive values to
- *  track. Keys in this object must be in snake_case. These properties will be
- *  sent in an additional event that excludes the user's metaMetricsId
- * @property {number} [revenue] - amount of currency that event creates in
- *  revenue for MetaMask if fragment is successful.
- * @property {string} [currency] - ISO 4127 format currency for events with
- *  revenue, defaults to US dollars
- * @property {number} [value] - Abstract business "value" attributable to
- *  customers who successfully complete this fragment
- * @property {MetaMetricsPageObject} [page] - the page/route that the event
- *  occurred on
- * @property {MetaMetricsReferrerObject} [referrer] - the origin of the dapp
- *  that initiated the event fragment.
- * @property {string} [uniqueIdentifier] - optional argument to override the
- *  automatic generation of UUID for the event fragment. This is useful when
- *  tracking events for subsystems that already generate UUIDs so to avoid
- *  unnecessary lookups and reduce accidental duplication.
- */
-
-/**
- * Represents the shape of data sent to the segment.track method.
- *
- * @typedef {object} SegmentEventPayload
- * @property {string} [userId] - The metametrics id for the user
- * @property {string} [anonymousId] - An anonymousId that is used to track
- *  sensitive data while preserving anonymity.
- * @property {string} event - name of the event to track
- * @property {object} properties - properties to attach to the event
- * @property {MetaMetricsContext} context - the context the event occurred in
- */
-
-/**
- * @typedef {object} MetaMetricsPagePayload
- * @property {string} name - The name of the page that was viewed
- * @property {object} [params] - The variadic parts of the page url
- *  example (route: `/asset/:asset`, path: `/asset/ETH`)
- *  params: { asset: 'ETH' }
- * @property {EnvironmentType} environmentType - the environment type that the
- *  page was viewed in
- * @property {MetaMetricsPageObject} [page] - the details of the page
- * @property {MetaMetricsReferrerObject} [referrer] - dapp that triggered the page
- *  view
- */
-
-/**
- * @typedef {object} MetaMetricsPageOptions
- * @property {boolean} [isOptInPath] - is the current path one of the pages in
- *  the onboarding workflow? If true and participateInMetaMetrics is null track
- *  the page view
- */
-
-/**
- * @typedef {object} Traits
- * @property {'address_book_entries'} ADDRESS_BOOK_ENTRIES - When the user
- *  adds or modifies addresses in address book the address_book_entries trait
- *  is identified.
- * @property {'ledger_connection_type'} LEDGER_CONNECTION_TYPE - when ledger
- *  live connnection type is changed we identify the ledger_connection_type
- *  trait
- * @property {'networks_added'} NETWORKS_ADDED - when user modifies networks
- *  we identify the networks_added trait
- * @property {'networks_without_ticker'} NETWORKS_WITHOUT_TICKER - when user
- *  modifies networks we identify the networks_without_ticker trait for
- *  networks without a ticker.
- * @property {'nft_autodetection_enabled'} NFT_AUTODETECTION_ENABLED - when Autodetect NFTs
- * feature is toggled we identify the nft_autodetection_enabled trait
- * @property {'number_of_accounts'} NUMBER_OF_ACCOUNTS - when identities
- *  change, we identify the new number_of_accounts trait
- * @property {'number_of_nft_collections'} NUMBER_OF_NFT_COLLECTIONS - user
- *  trait for number of unique NFT addresses
- * @property {'number_of_nfts'} NUMBER_OF_NFTS - user trait for number of all NFT addresses
- * @property {'number_of_tokens'} NUMBER_OF_TOKENS - when the number of tokens change, we
- * identify the new number_of_tokens trait
- * @property {'opensea_api_enabled'} OPENSEA_API_ENABLED - when the OpenSea API is enabled
- * we identify the opensea_api_enabled trait
- * @property {'three_box_enabled'} THREE_BOX_ENABLED - When 3Box feature is
- *  toggled we identify the 3box_enabled trait. This trait has been deprecated.
- * @property {'theme'} THEME - when the user's theme changes we identify the theme trait
- * @property {'token_detection_enabled'} TOKEN_DETECTION_ENABLED - when token detection feature is toggled we
- * identify the token_detection_enabled trait
- * @property {'install_date_ext'} INSTALL_DATE_EXT - when the user installed the extension
- * @property {'desktop_enabled'} [DESKTOP_ENABLED] - optional / does the user have desktop enabled?
- * @property {'security_providers'} SECURITY_PROVIDERS - when security provider feature is toggled we
- * identify the security_providers trait
- */
-
-/**
- *
- * @type {Traits}
- */
-
-export const TRAITS = {
-  ADDRESS_BOOK_ENTRIES: 'address_book_entries',
-  INSTALL_DATE_EXT: 'install_date_ext',
-  LEDGER_CONNECTION_TYPE: 'ledger_connection_type',
-  NETWORKS_ADDED: 'networks_added',
-  NETWORKS_WITHOUT_TICKER: 'networks_without_ticker',
-  NFT_AUTODETECTION_ENABLED: 'nft_autodetection_enabled',
-  NUMBER_OF_ACCOUNTS: 'number_of_accounts',
-  NUMBER_OF_NFT_COLLECTIONS: 'number_of_nft_collections',
-  NUMBER_OF_NFTS: 'number_of_nfts',
-  NUMBER_OF_TOKENS: 'number_of_tokens',
-  OPENSEA_API_ENABLED: 'opensea_api_enabled',
-  THEME: 'theme',
-  THREE_BOX_ENABLED: 'three_box_enabled',
-  TOKEN_DETECTION_ENABLED: 'token_detection_enabled',
-  DESKTOP_ENABLED: 'desktop_enabled',
-  SECURITY_PROVIDERS: 'security_providers',
-};
-
-/**
- * @typedef {object} MetaMetricsTraits
- * @property {number} [address_book_entries] - The number of entries in the
- *  user's address book.
- * @property {'ledgerLive' | 'webhid' | 'u2f'} [ledger_connection_type] - the
- *  type of ledger connection set by user preference.
- * @property {Array<string>} [networks_added] - An array consisting of chainIds
- *  that indicate the networks a user has added to their MetaMask.
- * @property {Array<string>} [networks_without_ticker] - An array consisting of
- *  chainIds that indicate the networks added by the user that do not have a
- *  ticker.
- * @property {number} [nft_autodetection_enabled] - does the user have the
- * use collection/nft detection enabled?
- * @property {number} [number_of_accounts] - A number representing the number
- *  of identities(accounts) added to the user's MetaMask.
- * @property {number} [number_of_nft_collections] - A number representing the
- *  amount of different NFT collections the user possesses an NFT from.
- * @property {number} [number_of_nfts] - A number representing the
- *  amount of all NFTs the user possesses across all networks and accounts.
- * @property {number} [number_of_tokens] - The total number of token contracts
- *  the user has across all networks and accounts.
- * @property {boolean} [opensea_api_enabled] - does the user have the OpenSea
- *  API enabled?
- * @property {boolean} [three_box_enabled] - Does the user have 3box sync
- *  enabled? (deprecated)
- * @property {string} [theme] - which theme the user has selected
- * @property {boolean} [token_detection_enabled] - does the user have token detection is enabled?
- * @property {boolean} [desktop_enabled] - optional / does the user have desktop enabled?
- * @property {Array<string>} [security_providers] - whether security provider feature toggle is on or off
- */
-
-// Mixpanel converts the zero address value to a truly anonymous event, which
-// speeds up reporting
-export const METAMETRICS_ANONYMOUS_ID = '0x0000000000000000';
-
-/**
- * This object is used to identify events that are triggered by the background
- * process.
- *
- * @type {MetaMetricsPageObject}
- */
-export const METAMETRICS_BACKGROUND_PAGE_OBJECT = {
-  path: '/background-process',
-  title: 'Background Process',
-  url: '/background-process',
-};
-
-/**
- * @typedef {object} SegmentInterface
- * @property {SegmentEventPayload[]} queue - A queue of events to be sent when
- *  the flushAt limit has been reached, or flushInterval occurs
- * @property {() => void} flush - Immediately flush the queue, resetting it to
- *  an empty array and sending the pending events to Segment
- * @property {(
- *  payload: SegmentEventPayload,
- *  callback: (err?: Error) => void
- * ) => void} track - Track an event with Segment, using the internal batching
- *  mechanism to optimize network requests
- * @property {(payload: object) => void} page - Track a page view with Segment
- * @property {() => void} identify - Identify an anonymous user. We do not
- *  currently use this method.
- */
-
-export const REJECT_NOTFICIATION_CLOSE = 'Cancel Via Notification Close';
-export const REJECT_NOTFICIATION_CLOSE_SIG =
-  'Cancel Sig Request Via Notification Close';
-
-/**
- * EVENTS
- */
-
-export const EVENT_NAMES = {
-  ACCOUNT_ADDED: 'Account Added',
-  ACCOUNT_ADD_SELECTED: 'Account Add Selected',
-  ACCOUNT_ADD_FAILED: 'Account Add Failed',
-  ACCOUNT_PASSWORD_CREATED: 'Account Password Created',
-  ACCOUNT_RESET: 'Account Reset',
-  APP_INSTALLED: 'App Installed',
-  APP_UNLOCKED: 'App Unlocked',
-  APP_UNLOCKED_FAILED: 'App Unlocked Failed',
-  APP_WINDOW_EXPANDED: 'App Window Expanded',
-  BRIDGE_LINK_CLICKED: 'Bridge Link Clicked',
-  DECRYPTION_APPROVED: 'Decryption Approved',
-  DECRYPTION_REJECTED: 'Decryption Rejected',
-  DECRYPTION_REQUESTED: 'Decryption Requested',
-  ENCRYPTION_PUBLIC_KEY_APPROVED: 'Encryption Approved',
-  ENCRYPTION_PUBLIC_KEY_REJECTED: 'Encryption Rejected',
-  ENCRYPTION_PUBLIC_KEY_REQUESTED: 'Encryption Requested',
-  EXTERNAL_LINK_CLICKED: 'External Link Clicked',
-  KEY_EXPORT_SELECTED: 'Key Export Selected',
-  KEY_EXPORT_REQUESTED: 'Key Export Requested',
-  KEY_EXPORT_FAILED: 'Key Export Failed',
-  KEY_EXPORT_CANCELED: 'Key Export Canceled',
-  KEY_EXPORT_REVEALED: 'Key Material Revealed',
-  KEY_EXPORT_COPIED: 'Key Material Copied',
-  KEY_TOKEN_DETECTION_SELECTED: 'Key Token Detection Selected',
-  KEY_GLOBAL_SECURITY_TOGGLE_SELECTED: 'Key Global Security/Privacy Settings',
-  KEY_BALANCE_TOKEN_PRICE_CHECKER:
-    'Key Show Balance and Token Price Checker Settings',
-  KEY_GAS_FEE_ESTIMATION_BUY_SWAP_TOKENS:
-    'Key Show Gas Fee Estimation, Buy Crypto and Swap Tokens',
-  KEY_AUTO_DETECT_TOKENS: 'Key Autodetect tokens',
-  KEY_BATCH_ACCOUNT_BALANCE_REQUESTS: 'Key Batch account balance requests',
-  METRICS_OPT_IN: 'Metrics Opt In',
-  METRICS_OPT_OUT: 'Metrics Opt Out',
-  NAV_ACCOUNT_MENU_OPENED: 'Account Menu Opened',
-  NAV_ACCOUNT_DETAILS_OPENED: 'Account Details Opened',
-  NAV_CONNECTED_SITES_OPENED: 'Connected Sites Opened',
-  NAV_MAIN_MENU_OPENED: 'Main Menu Opened',
-  NAV_NETWORK_MENU_OPENED: 'Network Menu Opened',
-  NAV_SETTINGS_OPENED: 'Settings Opened',
-  NAV_ACCOUNT_SWITCHED: 'Account Switched',
-  NAV_NETWORK_SWITCHED: 'Network Switched',
-  NAV_BUY_BUTTON_CLICKED: 'Buy Button Clicked',
-  NAV_SEND_BUTTON_CLICKED: 'Send Button Clicked',
-  NAV_SWAP_BUTTON_CLICKED: 'Swap Button Clicked',
-  SRP_TO_CONFIRM_BACKUP: 'SRP Backup Confirm Displayed',
-  WALLET_SETUP_STARTED: 'Wallet Setup Selected',
-  WALLET_SETUP_CANCELED: 'Wallet Setup Canceled',
-  WALLET_SETUP_FAILED: 'Wallet Setup Failed',
-  WALLET_CREATED: 'Wallet Created',
-  NFT_ADDED: 'NFT Added',
-  ONRAMP_PROVIDER_SELECTED: 'On-ramp Provider Selected',
-  PERMISSIONS_APPROVED: 'Permissions Approved',
-  PERMISSIONS_REJECTED: 'Permissions Rejected',
-  PERMISSIONS_REQUESTED: 'Permissions Requested',
-  PHISHING_PAGE_DISPLAYED: 'Phishing Page Displayed',
-  PORTFOLIO_LINK_CLICKED: 'Portfolio Link Clicked',
-  PUBLIC_ADDRESS_COPIED: 'Public Address Copied',
-  PROVIDER_METHOD_CALLED: 'Provider Method Called',
-  SIGNATURE_APPROVED: 'Signature Approved',
-  SIGNATURE_FAILED: 'Signature Failed',
-  SIGNATURE_REJECTED: 'Signature Rejected',
-  SIGNATURE_REQUESTED: 'Signature Requested',
-  TOKEN_IMPORT_BUTTON_CLICKED: 'Import Token Button Clicked',
-  TOKEN_SCREEN_OPENED: 'Token Screen Opened',
-  SUPPORT_LINK_CLICKED: 'Support Link Clicked',
-  TOKEN_ADDED: 'Token Added',
-  TOKEN_DETECTED: 'Token Detected',
-  TOKEN_HIDDEN: 'Token Hidden',
-  TOKEN_IMPORT_CANCELED: 'Token Import Canceled',
-  TOKEN_IMPORT_CLICKED: 'Token Import Clicked',
-  ONBOARDING_WELCOME: 'App Installed',
-  ONBOARDING_WALLET_CREATION_STARTED: 'Wallet Setup Selected',
-  ONBOARDING_WALLET_IMPORT_STARTED: 'Wallet Import Started',
-  ONBOARDING_WALLET_CREATION_ATTEMPTED: 'Wallet Password Created',
-  ONBOARDING_WALLET_SECURITY_STARTED: 'SRP Backup Selected',
-  ONBOARDING_WALLET_SECURITY_SKIP_INITIATED: 'SRP Skip Backup Selected',
-  ONBOARDING_WALLET_SECURITY_SKIP_CONFIRMED: 'SRP Backup Skipped',
-  ONBOARDING_WALLET_SECURITY_SKIP_CANCELED: 'SRP Skip Backup Canceled',
-  ONBOARDING_WALLET_SECURITY_PHRASE_REVEALED: 'SRP Revealed',
-  ONBOARDING_WALLET_SECURITY_PHRASE_WRITTEN_DOWN: 'SRP Backup Confirm Display',
-  ONBOARDING_WALLET_SECURITY_PHRASE_CONFIRMED: 'SRP Backup Confirmed',
-  ONBOARDING_WALLET_CREATION_COMPLETE: 'Wallet Created',
-  ONBOARDING_WALLET_SETUP_COMPLETE: 'Application Opened',
-  ONBOARDING_WALLET_ADVANCED_SETTINGS: 'Settings Updated',
-  ONBOARDING_WALLET_IMPORT_ATTEMPTED: 'Wallet Import Attempted',
-  ONBOARDING_WALLET_VIDEO_PLAY: 'SRP Intro Video Played',
-  ONBOARDING_TWITTER_CLICK: 'External Link Clicked',
-  SERVICE_WORKER_RESTARTED: 'Service Worker Restarted',
-};
-
-export const EVENT = {
-  ACCOUNT_TYPES: {
-    DEFAULT: 'metamask',
-    IMPORTED: 'imported',
-    HARDWARE: 'hardware',
-  },
-  ACCOUNT_IMPORT_TYPES: {
-    JSON: 'json',
-    PRIVATE_KEY: 'private_key',
-    SRP: 'srp',
-  },
-  CATEGORIES: {
-    ACCOUNTS: 'Accounts',
-    APP: 'App',
-    AUTH: 'Auth',
-    BACKGROUND: 'Background',
-    ERROR: 'Error',
-    FOOTER: 'Footer',
-    HOME: 'Home',
-    INPAGE_PROVIDER: 'inpage_provider',
-    KEYS: 'Keys',
-    MESSAGES: 'Messages',
-    NAVIGATION: 'Navigation',
-    NETWORK: 'Network',
-    ONBOARDING: 'Onboarding',
-    PHISHING: 'Phishing',
-    RETENTION: 'Retention',
-    SETTINGS: 'Settings',
-    SNAPS: 'Snaps',
-    SWAPS: 'Swaps',
-    TRANSACTIONS: 'Transactions',
-    WALLET: 'Wallet',
-    DESKTOP: 'Desktop',
-  },
-  EXTERNAL_LINK_TYPES: {
-    TRANSACTION_BLOCK_EXPLORER: 'Transaction Block Explorer',
-    BLOCK_EXPLORER: 'Block Explorer',
-    ACCOUNT_TRACKER: 'Account Tracker',
-    TOKEN_TRACKER: 'Token Tracker',
-  },
-  KEY_TYPES: {
-    PKEY: 'private_key',
-    SRP: 'srp',
-  },
-  ONRAMP_PROVIDER_TYPES: {
-    COINBASE: 'coinbase',
-    MOONPAY: 'moonpay',
-    WYRE: 'wyre',
-    TRANSAK: 'transak',
-    SELF_DEPOSIT: 'direct_deposit',
-  },
-  SOURCE: {
-    NETWORK: {
-      CUSTOM_NETWORK_FORM: 'custom_network_form',
-      POPULAR_NETWORK_LIST: 'popular_network_list',
-      DAPP: 'dapp',
-    },
-    SWAPS: {
-      MAIN_VIEW: 'Main View',
-      TOKEN_VIEW: 'Token View',
-    },
-    TOKEN: {
-      CUSTOM: 'custom',
-      DAPP: 'dapp',
-      DETECTED: 'detected',
-      LIST: 'list',
-    },
-    TRANSACTION: {
-      DAPP: 'dapp',
-      USER: 'user',
-    },
-    SERVICE_WORKERS: 'service_workers',
-  },
-  LOCATION: {
-    TOKEN_DETAILS: 'token_details',
-    TOKEN_DETECTION: 'token_detection',
-    TOKEN_MENU: 'token_menu',
-  },
-};
-
-// Values below (e.g. 'location') can be used in the "properties"
-// tracking object as keys, e.g. { location: 'Home' }
-export const CONTEXT_PROPS = {
-  PAGE_TITLE: 'location',
-};
-
-/**
- * These types correspond to the keys in the METAMETRIC_KEY_OPT object
- */
-export const METAMETRIC_KEY = {
-  UI_CUSTOMIZATIONS: `ui_customizations`,
-};
-
-/**
- * This object maps a METAMETRIC_KEY to an object of possible options
- */
-export const METAMETRIC_KEY_OPT = {
-  [METAMETRIC_KEY.UI_CUSTOMIZATIONS]: {
-    flaggedAsMalicious: 'flagged_as_malicious',
-    flaggedAsSafetyUnknown: 'flagged_as_safety_unknown',
-    SIWE: 'sign_in_with_ethereum',
-  },
-};
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
new file mode 100644
index 000000000..03626ff61
--- /dev/null
+++ b/shared/constants/metametrics.ts
@@ -0,0 +1,642 @@
+import type { EnvironmentType } from './app';
+import { LedgerTransportTypes } from './hardware-wallets';
+
+/**
+ * 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
+ * page events.
+ */
+export type MetaMetricsPageObject = {
+  /**
+   * The path of the current page (e.g. "/home").
+   */
+  path?: string;
+  /**
+   * The title of the current page (e.g. "home").
+   */
+  title?: string;
+  /**
+   * The fully qualified URL of the current page.
+   */
+  url?: string;
+};
+
+/**
+ * The dapp that triggered an interaction (MetaMask only).
+ */
+export type MetaMetricsReferrerObject = {
+  /**
+   * The origin of the dapp issuing the notification.
+   */
+  url?: string;
+};
+
+/**
+ * We attach context to every meta metrics event that help to qualify our
+ * analytics. This type has all optional values because it represents a
+ * returned object from a method call. Ideally app and userAgent are
+ * defined on every event. This is confirmed in the getTrackMetaMetricsEvent
+ * function, but still provides the consumer a way to override these values if
+ * necessary.
+ */
+type MetaMetricsContext = {
+  /**
+   * Application metadata.
+   */
+  app: {
+    /**
+     * The name of the application tracking the event.
+     */
+    name: string;
+    /**
+     * The version of the application.
+     */
+    version: string;
+  };
+  /**
+   * The user agent of the application.
+   */
+  userAgent: string;
+  /**
+   * An object representing details of the current page.
+   */
+  page?: MetaMetricsPageObject;
+  /**
+   * The dapp that triggered an interaction (MetaMask only).
+   */
+  referrer?: MetaMetricsReferrerObject;
+};
+
+export type MetaMetricsEventPayload = {
+  /**
+   * The event name to track.
+   */
+  event: string;
+  /**
+   * The category to associate the event to.
+   */
+  category: string;
+  /**
+   * The action ID to deduplicate event requests from the UI.
+   */
+  actionId?: number;
+  /**
+   * The type of environment this event occurred in. Defaults to the background
+   * process type.
+   */
+  environmentType?: string;
+  /**
+   * Custom values to track. Keys in this object must be `snake_case`.
+   */
+  properties?: object;
+  /**
+   * 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;
+  /**
+   * Amount of currency that the event creates in revenue for MetaMask.
+   */
+  revenue?: number;
+  /**
+   * ISO-4127-formatted currency for events with revenue. Defaults to US
+   * dollars.
+   */
+  currency?: string;
+  /**
+   * Abstract business "value" attributable to customers who trigger this event.
+   */
+  value?: number;
+  /**
+   * The page/route that the event occurred on.
+   */
+  page?: MetaMetricsPageObject;
+  /**
+   * The origin of the dapp that triggered this event.
+   */
+  referrer?: MetaMetricsReferrerObject;
+};
+
+export type MetaMetricsEventOptions = {
+  /**
+   * Whether or not the event happened during the opt-in workflow.
+   */
+  isOptIn?: boolean;
+  /**
+   * Whether the segment queue should be flushed after tracking the event.
+   * Recommended if the result of tracking the event must be known before UI
+   * transition or update.
+   */
+  flushImmediately?: boolean;
+  /**
+   * Whether to exclude the user's `metaMetricsId` for anonymity.
+   */
+  excludeMetaMetricsId?: boolean;
+  /**
+   * An override for the `metaMetricsId` in the event (no pun intended) one is
+   * created as a part of an asynchronous workflow, such as awaiting the result
+   * of the MetaMetrics opt-in function that generates the user's
+   * `metaMetricsId`.
+   */
+  metaMetricsId?: string;
+  /**
+   * Is this event a holdover from Matomo that needs further migration? When
+   * true, sends the data to a special Segment source that marks the event data
+   * as not conforming to our schema.
+   */
+  matomoEvent?: boolean;
+};
+
+export type MetaMetricsEventFragment = {
+  /**
+   * The event name to fire when the fragment is closed in an affirmative action.
+   */
+  successEvent: string;
+  /**
+   * The event name to fire when the fragment is closed with a rejection.
+   */
+  failureEvent?: string;
+  /**
+   * An event name to fire immediately upon fragment creation. This is useful
+   * for building funnels in mixpanel and for reduction of code duplication.
+   */
+  initialEvent?: string;
+  /**
+   * The event category to use for both the success and failure events.
+   */
+  category: string;
+  /**
+   * Should this fragment be persisted in state and progressed after the
+   * extension is locked and unlocked.
+   */
+  persist?: boolean;
+  /**
+   * Time in seconds the event should be persisted for. After the timeout the
+   * fragment will be closed as abandoned. If not supplied the fragment is
+   * stored indefinitely.
+   */
+  timeout?: number;
+  /**
+   * `Date.now()` when the fragment was last updated. Used to determine if the
+   * timeout has expired and the fragment should be closed.
+   */
+  lastUpdated?: number;
+  /**
+   * Custom values to track. Keys in this object must be `snake_case`.
+   */
+  properties?: object;
+  /**
+   * 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;
+  /**
+   * Amount of currency that the event creates in revenue for MetaMask.
+   */
+  revenue?: number;
+  /**
+   * ISO-4127-formatted currency for events with revenue. Defaults to US
+   * dollars.
+   */
+  currency?: string;
+  /**
+   * Abstract business "value" attributable to customers who trigger this event.
+   */
+  value?: number;
+  /**
+   * The page/route that the event occurred on.
+   */
+  page?: MetaMetricsPageObject;
+  /**
+   * The origin of the dapp that triggered this event.
+   */
+  referrer?: MetaMetricsReferrerObject;
+  /**
+   * Overrides the automatic generation of UUID for the event fragment. This is
+   * useful when tracking events for subsystems that already generate UUIDs so
+   * to avoid unnecessary lookups and reduce accidental duplication.
+   */
+  uniqueIdentifier?: string;
+};
+
+/**
+ * Data sent to the `segment.track` method.
+ */
+export type SegmentEventPayload = {
+  /**
+   * The MetaMetrics id for the user.
+   */
+  userId?: string;
+  /**
+   * An anonymous ID that is used to track sensitive data while preserving
+   * anonymity.
+   */
+  anonymousId?: string;
+  /**
+   * The name of the event to track.
+   */
+  event: string;
+  /**
+   * Properties to attach to the event.
+   */
+  properties: object;
+  /**
+   * The context the event occurred in.
+   */
+  context: MetaMetricsContext;
+};
+
+/**
+ * Data sent to MetaMetrics for page views.
+ */
+export type MetaMetricsPagePayload = {
+  /**
+   * The name of the page that was viewed.
+   */
+  name: string;
+  /**
+   * The variadic parts of the page URL.
+   *
+   * Example: If the route is `/asset/:asset` and the path is `/asset/ETH`,
+   * the `params` property would be `{ asset: 'ETH' }`.
+   */
+  params?: object;
+  /**
+   * The environment type that the page was viewed in.
+   */
+  environmentType: EnvironmentType;
+  /**
+   * The details of the page.
+   */
+  page?: MetaMetricsPageObject;
+  /**
+   * The dapp that triggered the page view.
+   */
+  referrer?: MetaMetricsReferrerObject;
+};
+
+export type MetaMetricsPageOptions = {
+  /**
+   * Is the current path one of the pages in the onboarding workflow? (If this
+   * is true and participateInMetaMetrics is null, then the page view will be
+   * tracked.)
+   */
+  isOptInPath?: boolean;
+};
+
+/**
+ * Data sent to MetaMetrics for user traits.
+ */
+export type MetaMetricsUserTraits = {
+  /**
+   * The number of entries in the user's address book.
+   */
+  address_book_entries?: number;
+  /**
+   * The type of ledger connection set by user preference.
+   */
+  ledger_connection_type?: LedgerTransportTypes;
+  /**
+   * An array consisting of chain IDs that represent the networks added by the
+   * user.
+   */
+  networks_added?: string[];
+  /**
+   * An array consisting of chain IDs that represent the networks added by the
+   * user that do not have a ticker.
+   */
+  networks_without_ticker?: string[];
+  /**
+   * Does the user have the Autodetect NFTs feature enabled?
+   */
+  nft_autodetection_enabled?: number;
+  /**
+   * A number representing the number of identities (accounts) added to the
+   * user's wallet.
+   */
+  number_of_accounts?: number;
+  /**
+   * A number representing the amount of NFT collections from which the user
+   * possesses NFTs.
+   */
+  number_of_nft_collections?: number;
+  /**
+   * A number representing the amount of all NFTs the user possesses across all
+   * networks and accounts.
+   */
+  number_of_nfts?: number;
+  /**
+   * The total number of token contracts the user has across all networks and
+   * accounts.
+   */
+  number_of_tokens?: number;
+  /**
+   * Does the user have the OpenSea API enabled?
+   */
+  opensea_api_enabled?: boolean;
+  /**
+   * Does the user have 3Box sync enabled?
+   *
+   * @deprecated
+   */
+  three_box_enabled?: boolean;
+  /**
+   * Which theme the user has selected.
+   */
+  theme?: string;
+  /**
+   * Does the user have token detection enabled?
+   */
+  token_detection_enabled?: boolean;
+  /**
+   * Does the user have desktop enabled?
+   */
+  desktop_enabled?: boolean;
+  /**
+   * Whether the security provider feature has been enabled.
+   */
+  security_providers?: string[];
+};
+
+export enum MetaMetricsUserTrait {
+  /**
+   * Identified when the user adds or modifies addresses in the address book.
+   */
+  AddressBookEntries = 'address_book_entries',
+  /**
+   * Identified when the user installed the extension.
+   */
+  InstallDateExt = 'install_date_ext',
+  /**
+   * Identified when the Ledger Live connection type is changed.
+   */
+  LedgerConnectionType = 'ledger_connection_type',
+  /**
+   * Identified when the user modifies networks.
+   */
+  NetworksAdded = 'networks_added',
+  /**
+   * Identified when the user modifies networks that lack a ticker.
+   */
+  NetworksWithoutTicker = 'networks_without_ticker',
+  /**
+   * Identified when the "Autodetect NFTs" feature is toggled.
+   */
+  NftAutodetectionEnabled = 'nft_autodetection_enabled',
+  /**
+   * Identified when identities change.
+   */
+  NumberOfAccounts = 'number_of_accounts',
+  /**
+   * The number of unique NFT addresses.
+   */
+  NumberOfNftCollections = 'number_of_nft_collections',
+  /**
+   * Identified when the number of NFTs owned by the user changes.
+   */
+  NumberOfNfts = 'number_of_nfts',
+  /**
+   * Identified when the number of tokens change.
+   */
+  NumberOfTokens = 'number_of_tokens',
+  /**
+   * Identified when the OpenSea API is enabled.
+   */
+  OpenSeaApiEnabled = 'opensea_api_enabled',
+  /**
+   * Identified when the user's theme changes.
+   */
+  Theme = 'theme',
+  /**
+   * Identified when the 3Box feature is toggled.
+   *
+   * @deprecated
+   */
+  ThreeBoxEnabled = 'three_box_enabled',
+  /**
+   * Identified when the token detection feature is toggled.
+   */
+  TokenDetectionEnabled = 'token_detection_enabled',
+  /**
+   * Identified when the user enables desktop.
+   */
+  DesktopEnabled = 'desktop_enabled',
+  /**
+   * Identified when the security provider feature is enabled.
+   */
+  SecurityProviders = 'security_providers',
+}
+
+/**
+ * Mixpanel converts the zero address value to a truly anonymous event, which
+ * speeds up reporting
+ */
+export const METAMETRICS_ANONYMOUS_ID = '0x0000000000000000';
+
+/**
+ * Used to identify events that are triggered by the background process.
+ */
+export const METAMETRICS_BACKGROUND_PAGE_OBJECT: MetaMetricsPageObject = {
+  path: '/background-process',
+  title: 'Background Process',
+  url: '/background-process',
+};
+
+export const REJECT_NOTIFICATION_CLOSE = 'Cancel Via Notification Close';
+
+export const REJECT_NOTIFICATION_CLOSE_SIG =
+  'Cancel Sig Request Via Notification Close';
+
+export enum MetaMetricsEventName {
+  AccountAdded = 'Account Added',
+  AccountAddSelected = 'Account Add Selected',
+  AccountAddFailed = 'Account Add Failed',
+  AccountPasswordCreated = 'Account Password Created',
+  AccountReset = 'Account Reset',
+  AppInstalled = 'App Installed',
+  AppUnlocked = 'App Unlocked',
+  AppUnlockedFailed = 'App Unlocked Failed',
+  AppWindowExpanded = 'App Window Expanded',
+  BridgeLinkClicked = 'Bridge Link Clicked',
+  DecryptionApproved = 'Decryption Approved',
+  DecryptionRejected = 'Decryption Rejected',
+  DecryptionRequested = 'Decryption Requested',
+  EncryptionPublicKeyApproved = 'Encryption Approved',
+  EncryptionPublicKeyRejected = 'Encryption Rejected',
+  EncryptionPublicKeyRequested = 'Encryption Requested',
+  ExternalLinkClicked = 'External Link Clicked',
+  KeyExportSelected = 'Key Export Selected',
+  KeyExportRequested = 'Key Export Requested',
+  KeyExportFailed = 'Key Export Failed',
+  KeyExportCanceled = 'Key Export Canceled',
+  KeyExportRevealed = 'Key Material Revealed',
+  KeyExportCopied = 'Key Material Copied',
+  KeyTokenDetectionSelected = 'Key Token Detection Selected',
+  KeyGlobalSecurityToggleSelected = 'Key Global Security/Privacy Settings',
+  KeyBalanceTokenPriceChecker = 'Key Show Balance and Token Price Checker Settings',
+  KeyGasFeeEstimationBuySwapTokens = 'Key Show Gas Fee Estimation, Buy Crypto and Swap Tokens',
+  KeyAutoDetectTokens = 'Key Autodetect tokens',
+  KeyBatchAccountBalanceRequests = 'Key Batch account balance requests',
+  MetricsOptIn = 'Metrics Opt In',
+  MetricsOptOut = 'Metrics Opt Out',
+  NavAccountMenuOpened = 'Account Menu Opened',
+  NavAccountDetailsOpened = 'Account Details Opened',
+  NavConnectedSitesOpened = 'Connected Sites Opened',
+  NavMainMenuOpened = 'Main Menu Opened',
+  NavNetworkMenuOpened = 'Network Menu Opened',
+  NavSettingsOpened = 'Settings Opened',
+  NavAccountSwitched = 'Account Switched',
+  NavNetworkSwitched = 'Network Switched',
+  NavBuyButtonClicked = 'Buy Button Clicked',
+  NavSendButtonClicked = 'Send Button Clicked',
+  NavSwapButtonClicked = 'Swap Button Clicked',
+  SrpToConfirmBackup = 'SRP Backup Confirm Displayed',
+  WalletSetupStarted = 'Wallet Setup Selected',
+  WalletSetupCanceled = 'Wallet Setup Canceled',
+  WalletSetupFailed = 'Wallet Setup Failed',
+  WalletCreated = 'Wallet Created',
+  NftAdded = 'NFT Added',
+  OnrampProviderSelected = 'On-ramp Provider Selected',
+  PermissionsApproved = 'Permissions Approved',
+  PermissionsRejected = 'Permissions Rejected',
+  PermissionsRequested = 'Permissions Requested',
+  PhishingPageDisplayed = 'Phishing Page Displayed',
+  PortfolioLinkClicked = 'Portfolio Link Clicked',
+  PublicAddressCopied = 'Public Address Copied',
+  ProviderMethodCalled = 'Provider Method Called',
+  SignatureApproved = 'Signature Approved',
+  SignatureFailed = 'Signature Failed',
+  SignatureRejected = 'Signature Rejected',
+  SignatureRequested = 'Signature Requested',
+  TokenImportButtonClicked = 'Import Token Button Clicked',
+  TokenScreenOpened = 'Token Screen Opened',
+  SupportLinkClicked = 'Support Link Clicked',
+  TokenAdded = 'Token Added',
+  TokenDetected = 'Token Detected',
+  TokenHidden = 'Token Hidden',
+  TokenImportCanceled = 'Token Import Canceled',
+  TokenImportClicked = 'Token Import Clicked',
+  OnboardingWelcome = 'App Installed',
+  OnboardingWalletCreationStarted = 'Wallet Setup Selected',
+  OnboardingWalletImportStarted = 'Wallet Import Started',
+  OnboardingWalletCreationAttempted = 'Wallet Password Created',
+  OnboardingWalletSecurityStarted = 'SRP Backup Selected',
+  OnboardingWalletSecuritySkipInitiated = 'SRP Skip Backup Selected',
+  OnboardingWalletSecuritySkipConfirmed = 'SRP Backup Skipped',
+  OnboardingWalletSecuritySkipCanceled = 'SRP Skip Backup Canceled',
+  OnboardingWalletSecurityPhraseRevealed = 'SRP Revealed',
+  OnboardingWalletSecurityPhraseWrittenDown = 'SRP Backup Confirm Display',
+  OnboardingWalletSecurityPhraseConfirmed = 'SRP Backup Confirmed',
+  OnboardingWalletCreationComplete = 'Wallet Created',
+  OnboardingWalletSetupComplete = 'Application Opened',
+  OnboardingWalletAdvancedSettings = 'Settings Updated',
+  OnboardingWalletImportAttempted = 'Wallet Import Attempted',
+  OnboardingWalletVideoPlay = 'SRP Intro Video Played',
+  OnboardingTwitterClick = 'External Link Clicked',
+  ServiceWorkerRestarted = 'Service Worker Restarted',
+}
+
+export enum MetaMetricsEventAccountType {
+  Default = 'metamask',
+  Imported = 'imported',
+  Hardware = 'hardware',
+}
+
+export enum MetaMetricsEventAccountImportType {
+  Json = 'json',
+  PrivateKey = 'private_key',
+  Srp = 'srp',
+}
+
+export enum MetaMetricsEventCategory {
+  Accounts = 'Accounts',
+  App = 'App',
+  Auth = 'Auth',
+  Background = 'Background',
+  // The TypeScript ESLint rule is incorrectly marking this line.
+  /* eslint-disable-next-line @typescript-eslint/no-shadow */
+  Error = 'Error',
+  Footer = 'Footer',
+  Home = 'Home',
+  InpageProvider = 'inpage_provider',
+  Keys = 'Keys',
+  Messages = 'Messages',
+  Navigation = 'Navigation',
+  Network = 'Network',
+  Onboarding = 'Onboarding',
+  Phishing = 'Phishing',
+  Retention = 'Retention',
+  Settings = 'Settings',
+  Snaps = 'Snaps',
+  Swaps = 'Swaps',
+  Transactions = 'Transactions',
+  Wallet = 'Wallet',
+  Desktop = 'Desktop',
+  ServiceWorkers = 'service_workers',
+}
+
+export enum MetaMetricsEventLinkType {
+  TransactionBlockExplorer = 'Transaction Block Explorer',
+  BlockExplorer = 'Block Explorer',
+  AccountTracker = 'Account Tracker',
+  TokenTracker = 'Token Tracker',
+}
+
+export enum MetaMetricsEventKeyType {
+  Pkey = 'private_key',
+  Srp = 'srp',
+}
+
+// NOTE: This doesn't seem to be used at all
+export enum MetaMetricsEventOnrampProviderType {
+  Coinbase = 'coinbase',
+  Moonpay = 'moonpay',
+  Wyre = 'wyre',
+  Transak = 'transak',
+  SelfDeposit = 'direct_deposit',
+}
+
+export enum MetaMetricsNetworkEventSource {
+  CustomNetworkForm = 'custom_network_form',
+  PopularNetworkList = 'popular_network_list',
+  Dapp = 'dapp',
+}
+
+export enum MetaMetricsSwapsEventSource {
+  MainView = 'Main View',
+  TokenView = 'Token View',
+}
+
+export enum MetaMetricsTokenEventSource {
+  Custom = 'custom',
+  Dapp = 'dapp',
+  Detected = 'detected',
+  List = 'list',
+}
+
+export enum MetaMetricsTransactionEventSource {
+  Dapp = 'dapp',
+  User = 'user',
+}
+
+export enum MetaMetricsEventLocation {
+  TokenDetails = 'token_details',
+  TokenDetection = 'token_detection',
+  TokenMenu = 'token_menu',
+}
+
+export enum MetaMetricsEventUiCustomization {
+  FlaggedAsMalicious = 'flagged_as_malicious',
+  FlaggedAsSafetyUnknown = 'flagged_as_safety_unknown',
+  Siwe = 'sign_in_with_ethereum',
+}
+
+/**
+ * Values that can used in the "properties" tracking object as keys, e.g. `{
+ * location: 'Home' }`.
+ */
+export enum MetaMetricsContextProp {
+  PageTitle = 'location',
+}
diff --git a/ui/components/app/account-menu/account-menu.component.js b/ui/components/app/account-menu/account-menu.component.js
index c27788402..c20b83e5c 100644
--- a/ui/components/app/account-menu/account-menu.component.js
+++ b/ui/components/app/account-menu/account-menu.component.js
@@ -6,9 +6,10 @@ import InputAdornment from '@material-ui/core/InputAdornment';
 import classnames from 'classnames';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventAccountType,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import Identicon from '../../ui/identicon';
@@ -209,8 +210,8 @@ export default class AccountMenu extends Component {
           className="account-menu__account account-menu__item--clickable"
           onClick={() => {
             this.context.trackEvent({
-              category: EVENT.CATEGORIES.NAVIGATION,
-              event: EVENT_NAMES.NAV_ACCOUNT_SWITCHED,
+              category: MetaMetricsEventCategory.Navigation,
+              event: MetaMetricsEventName.NavAccountSwitched,
               properties: {
                 location: 'Main Menu',
               },
@@ -360,10 +361,10 @@ export default class AccountMenu extends Component {
           onClick={() => {
             toggleAccountMenu();
             trackEvent({
-              category: EVENT.CATEGORIES.NAVIGATION,
-              event: EVENT_NAMES.ACCOUNT_ADD_SELECTED,
+              category: MetaMetricsEventCategory.Navigation,
+              event: MetaMetricsEventName.AccountAddSelected,
               properties: {
-                account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
+                account_type: MetaMetricsEventAccountType.Default,
                 location: 'Main Menu',
               },
             });
@@ -378,10 +379,10 @@ export default class AccountMenu extends Component {
           onClick={() => {
             toggleAccountMenu();
             trackEvent({
-              category: EVENT.CATEGORIES.NAVIGATION,
-              event: EVENT_NAMES.ACCOUNT_ADD_SELECTED,
+              category: MetaMetricsEventCategory.Navigation,
+              event: MetaMetricsEventName.AccountAddSelected,
               properties: {
-                account_type: EVENT.ACCOUNT_TYPES.IMPORTED,
+                account_type: MetaMetricsEventAccountType.Imported,
                 location: 'Main Menu',
               },
             });
@@ -396,10 +397,10 @@ export default class AccountMenu extends Component {
           onClick={() => {
             toggleAccountMenu();
             trackEvent({
-              category: EVENT.CATEGORIES.NAVIGATION,
-              event: EVENT_NAMES.ACCOUNT_ADD_SELECTED,
+              category: MetaMetricsEventCategory.Navigation,
+              event: MetaMetricsEventName.AccountAddSelected,
               properties: {
-                account_type: EVENT.ACCOUNT_TYPES.HARDWARE,
+                account_type: MetaMetricsEventAccountType.Hardware,
                 location: 'Main Menu',
               },
             });
@@ -446,14 +447,16 @@ export default class AccountMenu extends Component {
           onClick={() => {
             trackEvent(
               {
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+                category: MetaMetricsEventCategory.Navigation,
+                event: MetaMetricsEventName.SupportLinkClicked,
                 properties: {
                   url: supportLink,
                 },
               },
               {
-                contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+                contextPropsIntoEventProperties: [
+                  MetaMetricsContextProp.PageTitle,
+                ],
               },
             );
             global.platform.openTab({ url: supportLink });
@@ -472,8 +475,8 @@ export default class AccountMenu extends Component {
             toggleAccountMenu();
             history.push(SETTINGS_ROUTE);
             this.context.trackEvent({
-              category: EVENT.CATEGORIES.NAVIGATION,
-              event: EVENT_NAMES.NAV_SETTINGS_OPENED,
+              category: MetaMetricsEventCategory.Navigation,
+              event: MetaMetricsEventName.NavSettingsOpened,
               properties: {
                 location: 'Main Menu',
               },
diff --git a/ui/components/app/add-network/add-network.js b/ui/components/app/add-network/add-network.js
index 816d1e92c..48eaa711d 100644
--- a/ui/components/app/add-network/add-network.js
+++ b/ui/components/app/add-network/add-network.js
@@ -37,7 +37,7 @@ import { ADD_NETWORK_ROUTE } from '../../../helpers/constants/routes';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
 import { Icon, ICON_NAMES, ICON_SIZES, Text } from '../../component-library';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsNetworkEventSource } from '../../../../shared/constants/metametrics';
 
 const AddNetwork = () => {
   const t = useContext(I18nContext);
@@ -267,7 +267,8 @@ const AddNetwork = () => {
                             imageUrl: item.rpcPrefs?.imageUrl,
                             chainName: item.nickname,
                             referrer: ORIGIN_METAMASK,
-                            source: EVENT.SOURCE.NETWORK.POPULAR_NETWORK_LIST,
+                            source:
+                              MetaMetricsNetworkEventSource.PopularNetworkList,
                           },
                         }),
                       );
diff --git a/ui/components/app/app-header/app-header.component.js b/ui/components/app/app-header/app-header.component.js
index e7178a56f..248dda89f 100644
--- a/ui/components/app/app-header/app-header.component.js
+++ b/ui/components/app/app-header/app-header.component.js
@@ -4,7 +4,10 @@ import classnames from 'classnames';
 import Identicon from '../../ui/identicon';
 import MetaFoxLogo from '../../ui/metafox-logo';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import NetworkDisplay from '../network-display';
 
 ///: BEGIN:ONLY_INCLUDE_IN(beta)
@@ -57,8 +60,8 @@ export default class AppHeader extends PureComponent {
 
     if (networkDropdownOpen === false) {
       this.context.trackEvent({
-        category: EVENT.CATEGORIES.NAVIGATION,
-        event: EVENT_NAMES.NAV_NETWORK_MENU_OPENED,
+        category: MetaMetricsEventCategory.Navigation,
+        event: MetaMetricsEventName.NavNetworkMenuOpened,
         properties: {},
       });
       showNetworkDropdown();
@@ -90,8 +93,8 @@ export default class AppHeader extends PureComponent {
             if (!disabled) {
               !isAccountMenuOpen &&
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
-                  event: EVENT_NAMES.NAV_MAIN_MENU_OPENED,
+                  category: MetaMetricsEventCategory.Navigation,
+                  event: MetaMetricsEventName.NavMainMenuOpened,
                   properties: {},
                 });
               toggleAccountMenu();
diff --git a/ui/components/app/asset-list-item/asset-list-item.js b/ui/components/app/asset-list-item/asset-list-item.js
index c25682355..a5cc5051f 100644
--- a/ui/components/app/asset-list-item/asset-list-item.js
+++ b/ui/components/app/asset-list-item/asset-list-item.js
@@ -13,7 +13,7 @@ import { startNewDraftTransaction } from '../../../ducks/send';
 import { SEND_ROUTE } from '../../../helpers/constants/routes';
 import { Color, SEVERITIES } from '../../../helpers/constants/design-system';
 import { INVALID_ASSET_TYPE } from '../../../helpers/constants/error-keys';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { AssetType } from '../../../../shared/constants/transaction';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { Icon, ICON_NAMES, ICON_SIZES } from '../../component-library';
@@ -68,7 +68,7 @@ const AssetListItem = ({
           e.stopPropagation();
           trackEvent({
             event: 'Clicked Send: Token',
-            category: EVENT.CATEGORIES.NAVIGATION,
+            category: MetaMetricsEventCategory.Navigation,
             properties: {
               action: 'Home',
               legacy_event: true,
diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js
index e83606e8b..5e305dcf9 100644
--- a/ui/components/app/asset-list/asset-list.js
+++ b/ui/components/app/asset-list/asset-list.js
@@ -24,7 +24,10 @@ import {
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import DetectedToken from '../detected-token/detected-token';
 import {
   DetectedTokensBanner,
@@ -110,8 +113,8 @@ const AssetList = ({ onClickAsset }) => {
         onTokenClick={(tokenAddress) => {
           onClickAsset(tokenAddress);
           trackEvent({
-            event: EVENT_NAMES.TOKEN_SCREEN_OPENED,
-            category: EVENT.CATEGORIES.NAVIGATION,
+            event: MetaMetricsEventName.TokenScreenOpened,
+            category: MetaMetricsEventCategory.Navigation,
             properties: {
               token_symbol: primaryCurrencyProperties.suffix,
               location: 'Home',
diff --git a/ui/components/app/asset-list/detetcted-tokens-link/detected-tokens-link.js b/ui/components/app/asset-list/detetcted-tokens-link/detected-tokens-link.js
index adad64e95..9c9ef6230 100644
--- a/ui/components/app/asset-list/detetcted-tokens-link/detected-tokens-link.js
+++ b/ui/components/app/asset-list/detetcted-tokens-link/detected-tokens-link.js
@@ -9,8 +9,9 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { getDetectedTokensInCurrentNetwork } from '../../../../selectors';
 import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
-  EVENT,
-  EVENT_NAMES,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsTokenEventSource,
 } from '../../../../../shared/constants/metametrics';
 
 const DetectedTokensLink = ({ className = '', setShowDetectedTokens }) => {
@@ -25,10 +26,10 @@ const DetectedTokensLink = ({ className = '', setShowDetectedTokens }) => {
   const onClick = () => {
     setShowDetectedTokens(true);
     trackEvent({
-      event: EVENT_NAMES.TOKEN_IMPORT_CLICKED,
-      category: EVENT.CATEGORIES.WALLET,
+      event: MetaMetricsEventName.TokenImportClicked,
+      category: MetaMetricsEventCategory.Wallet,
       properties: {
-        source: EVENT.SOURCE.TOKEN.DETECTED,
+        source: MetaMetricsTokenEventSource.Detected,
         tokens: detectedTokensDetails,
       },
     });
diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js
index aa12f0cf5..1c9b74d6a 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container.component.js
@@ -44,7 +44,10 @@ import {
 } from '../../../selectors';
 import useRamps from '../../../hooks/experiences/useRamps';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import {
   ConfirmPageContainerHeader,
   ConfirmPageContainerContent,
@@ -250,8 +253,8 @@ const ConfirmPageContainer = (props) => {
                         onClick={() => {
                           openBuyCryptoInPdapp();
                           trackEvent({
-                            event: EVENT_NAMES.NAV_BUY_BUTTON_CLICKED,
-                            category: EVENT.CATEGORIES.NAVIGATION,
+                            event: MetaMetricsEventName.NavBuyButtonClicked,
+                            category: MetaMetricsEventCategory.Navigation,
                             properties: {
                               location: 'Transaction Confirmation',
                               text: 'Buy',
diff --git a/ui/components/app/desktop-enable-button/desktop-enable-button.component.js b/ui/components/app/desktop-enable-button/desktop-enable-button.component.js
index 52099e738..650e13e60 100644
--- a/ui/components/app/desktop-enable-button/desktop-enable-button.component.js
+++ b/ui/components/app/desktop-enable-button/desktop-enable-button.component.js
@@ -20,7 +20,7 @@ import {
 } from '../../../store/actions';
 import { SECOND } from '../../../../shared/constants/time';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 
 const DESKTOP_ERROR_DESKTOP_OUTDATED_ROUTE = `${DESKTOP_ERROR_ROUTE}/${EXTENSION_ERROR_PAGE_TYPES.DESKTOP_OUTDATED}`;
 const DESKTOP_ERROR_EXTENSION_OUTDATED_ROUTE = `${DESKTOP_ERROR_ROUTE}/${EXTENSION_ERROR_PAGE_TYPES.EXTENSION_OUTDATED}`;
@@ -45,7 +45,7 @@ export default function DesktopEnableButton() {
       await disableDesktop();
       setDesktopEnabled(false);
       trackEvent({
-        category: EVENT.CATEGORIES.DESKTOP,
+        category: MetaMetricsEventCategory.Desktop,
         event: DESKTOP_UPDATE_SETTINGS_EVENT,
         properties: {
           desktop_enabled: false,
@@ -90,7 +90,7 @@ export default function DesktopEnableButton() {
     }
 
     trackEvent({
-      category: EVENT.CATEGORIES.DESKTOP,
+      category: MetaMetricsEventCategory.Desktop,
       event: 'Desktop Button Clicked',
       properties: {
         button_action: 'Enable MetaMask Desktop',
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 a72664086..4ae5204fc 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
@@ -5,8 +5,9 @@ import { useSelector } from 'react-redux';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
-  EVENT,
-  EVENT_NAMES,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsTokenEventSource,
 } from '../../../../../shared/constants/metametrics';
 import { getDetectedTokensInCurrentNetwork } from '../../../../selectors';
 
@@ -40,10 +41,10 @@ const DetectedTokenSelectionPopover = ({
       ({ address, symbol }) => `${symbol} - ${address}`,
     );
     trackEvent({
-      event: EVENT_NAMES.TOKEN_IMPORT_CANCELED,
-      category: EVENT.CATEGORIES.WALLET,
+      event: MetaMetricsEventName.TokenImportCanceled,
+      category: MetaMetricsEventCategory.Wallet,
       properties: {
-        source: EVENT.SOURCE.TOKEN.DETECTED,
+        source: MetaMetricsTokenEventSource.Detected,
         tokens: eventTokensDetails,
       },
     });
diff --git a/ui/components/app/detected-token/detected-token.js b/ui/components/app/detected-token/detected-token.js
index feadbab24..02484563b 100644
--- a/ui/components/app/detected-token/detected-token.js
+++ b/ui/components/app/detected-token/detected-token.js
@@ -15,7 +15,12 @@ import {
   AssetType,
   TokenStandard,
 } from '../../../../shared/constants/transaction';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventLocation,
+  MetaMetricsEventName,
+  MetaMetricsTokenEventSource,
+} from '../../../../shared/constants/metametrics';
 import DetectedTokenSelectionPopover from './detected-token-selection-popover/detected-token-selection-popover';
 import DetectedTokenIgnoredPopover from './detected-token-ignored-popover/detected-token-ignored-popover';
 
@@ -58,13 +63,13 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
   const importSelectedTokens = async (selectedTokens) => {
     selectedTokens.forEach((importedToken) => {
       trackEvent({
-        event: EVENT_NAMES.TOKEN_ADDED,
-        category: EVENT.CATEGORIES.WALLET,
+        event: MetaMetricsEventName.TokenAdded,
+        category: MetaMetricsEventCategory.Wallet,
         sensitiveProperties: {
           token_symbol: importedToken.symbol,
           token_contract_address: importedToken.address,
           token_decimal_precision: importedToken.decimals,
-          source: EVENT.SOURCE.TOKEN.DETECTED,
+          source: MetaMetricsTokenEventSource.Detected,
           token_standard: TokenStandard.ERC20,
           asset_type: AssetType.token,
         },
@@ -86,11 +91,11 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
       ({ symbol, address }) => `${symbol} - ${address}`,
     );
     trackEvent({
-      event: EVENT_NAMES.TOKEN_HIDDEN,
-      category: EVENT.CATEGORIES.WALLET,
+      event: MetaMetricsEventName.TokenHidden,
+      category: MetaMetricsEventCategory.Wallet,
       sensitiveProperties: {
         tokens: tokensDetailsList,
-        location: EVENT.LOCATION.TOKEN_DETECTION,
+        location: MetaMetricsEventLocation.TokenDetection,
         token_standard: TokenStandard.ERC20,
         asset_type: AssetType.token,
       },
diff --git a/ui/components/app/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js
index c40ccc79d..d101e5769 100644
--- a/ui/components/app/dropdowns/network-dropdown.js
+++ b/ui/components/app/dropdowns/network-dropdown.js
@@ -23,7 +23,11 @@ import { IconColor, Size } from '../../../helpers/constants/design-system';
 import { getShowTestNetworks } from '../../../selectors';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsNetworkEventSource,
+} from '../../../../shared/constants/metametrics';
 import {
   ADD_POPULAR_CUSTOM_NETWORK,
   ADVANCED_ROUTE,
@@ -127,8 +131,8 @@ class NetworkDropdown extends Component {
     const { trackEvent } = this.context;
 
     trackEvent({
-      category: EVENT.CATEGORIES.NAVIGATION,
-      event: EVENT_NAMES.NAV_NETWORK_SWITCHED,
+      category: MetaMetricsEventCategory.Navigation,
+      event: MetaMetricsEventName.NavNetworkSwitched,
       properties: {
         from_network: providerType,
         to_network: newProviderType,
@@ -320,7 +324,7 @@ class NetworkDropdown extends Component {
               },
               {
                 setActive: true,
-                source: EVENT.SOURCE.NETWORK.CUSTOM_NETWORK_FORM,
+                source: MetaMetricsNetworkEventSource.CustomNetworkForm,
               },
             );
           }
diff --git a/ui/components/app/import-token-link/import-token-link.component.js b/ui/components/app/import-token-link/import-token-link.component.js
index 6f5e93a1b..cf7ebae1f 100644
--- a/ui/components/app/import-token-link/import-token-link.component.js
+++ b/ui/components/app/import-token-link/import-token-link.component.js
@@ -8,7 +8,10 @@ import Box from '../../ui/box/box';
 import { TEXT_ALIGN } from '../../../helpers/constants/design-system';
 import { detectNewTokens } from '../../../store/actions';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import {
   getIsTokenDetectionSupported,
   getIsTokenDetectionInactiveOnMainnet,
@@ -51,8 +54,8 @@ export default function ImportTokenLink() {
         onClick={() => {
           history.push(IMPORT_TOKEN_ROUTE);
           trackEvent({
-            event: EVENT_NAMES.TOKEN_IMPORT_BUTTON_CLICKED,
-            category: EVENT.CATEGORIES.NAVIGATION,
+            event: MetaMetricsEventName.TokenImportButtonClicked,
+            category: MetaMetricsEventCategory.Navigation,
             properties: {
               location: 'Home',
             },
diff --git a/ui/components/app/menu-bar/account-options-menu.js b/ui/components/app/menu-bar/account-options-menu.js
index deeb4e0a3..b5469687b 100644
--- a/ui/components/app/menu-bar/account-options-menu.js
+++ b/ui/components/app/menu-bar/account-options-menu.js
@@ -22,7 +22,11 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
 import { KeyringType } from '../../../../shared/constants/keyring';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventLinkType,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { ICON_NAMES } from '../../component-library';
 
@@ -50,10 +54,10 @@ export default function AccountOptionsMenu({ anchorElement, onClose }) {
 
   const openBlockExplorer = () => {
     trackEvent({
-      event: EVENT_NAMES.EXTERNAL_LINK_CLICKED,
-      category: EVENT.CATEGORIES.NAVIGATION,
+      event: MetaMetricsEventName.ExternalLinkClicked,
+      category: MetaMetricsEventCategory.Navigation,
       properties: {
-        link_type: EVENT.EXTERNAL_LINK_TYPES.ACCOUNT_TRACKER,
+        link_type: MetaMetricsEventLinkType.AccountTracker,
         location: 'Account Options',
         url_domain: getURLHostName(addressLink),
       },
@@ -96,8 +100,8 @@ export default function AccountOptionsMenu({ anchorElement, onClose }) {
         <MenuItem
           onClick={() => {
             trackEvent({
-              event: EVENT_NAMES.APP_WINDOW_EXPANDED,
-              category: EVENT.CATEGORIES.NAVIGATION,
+              event: MetaMetricsEventName.AppWindowExpanded,
+              category: MetaMetricsEventCategory.Navigation,
               properties: {
                 location: 'Account Options',
               },
@@ -115,8 +119,8 @@ export default function AccountOptionsMenu({ anchorElement, onClose }) {
         onClick={() => {
           dispatch(showModal({ name: 'ACCOUNT_DETAILS' }));
           trackEvent({
-            event: EVENT_NAMES.NAV_ACCOUNT_DETAILS_OPENED,
-            category: EVENT.CATEGORIES.NAVIGATION,
+            event: MetaMetricsEventName.NavAccountDetailsOpened,
+            category: MetaMetricsEventCategory.Navigation,
             properties: {
               location: 'Account Options',
             },
@@ -131,8 +135,8 @@ export default function AccountOptionsMenu({ anchorElement, onClose }) {
         data-testid="account-options-menu__connected-sites"
         onClick={() => {
           trackEvent({
-            event: EVENT_NAMES.NAV_CONNECTED_SITES_OPENED,
-            category: EVENT.CATEGORIES.NAVIGATION,
+            event: MetaMetricsEventName.NavConnectedSitesOpened,
+            category: MetaMetricsEventCategory.Navigation,
             properties: {
               location: 'Account Options',
             },
diff --git a/ui/components/app/menu-bar/menu-bar.js b/ui/components/app/menu-bar/menu-bar.js
index 3ddc301af..99afdf1c6 100644
--- a/ui/components/app/menu-bar/menu-bar.js
+++ b/ui/components/app/menu-bar/menu-bar.js
@@ -6,7 +6,10 @@ import SelectedAccount from '../selected-account';
 import ConnectedStatusIndicator from '../connected-status-indicator';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { CONNECTED_ACCOUNTS_ROUTE } from '../../../helpers/constants/routes';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getOriginOfCurrentTab } from '../../../selectors';
@@ -44,8 +47,8 @@ export default function MenuBar() {
           ariaLabel={t('accountOptions')}
           onClick={() => {
             trackEvent({
-              event: EVENT_NAMES.NAV_ACCOUNT_MENU_OPENED,
-              category: EVENT.CATEGORIES.NAVIGATION,
+              event: MetaMetricsEventName.NavAccountMenuOpened,
+              category: MetaMetricsEventCategory.Navigation,
               properties: {
                 location: 'Home',
               },
diff --git a/ui/components/app/modals/account-details-modal/account-details-modal.component.js b/ui/components/app/modals/account-details-modal/account-details-modal.component.js
index 189b18fbc..f1ad623c6 100644
--- a/ui/components/app/modals/account-details-modal/account-details-modal.component.js
+++ b/ui/components/app/modals/account-details-modal/account-details-modal.component.js
@@ -9,8 +9,10 @@ import Button from '../../../ui/button';
 import { getURLHostName } from '../../../../helpers/utils/util';
 import { isHardwareKeyring } from '../../../../helpers/utils/hardware';
 import {
-  EVENT,
-  EVENT_NAMES,
+  MetaMetricsEventCategory,
+  MetaMetricsEventLinkType,
+  MetaMetricsEventKeyType,
+  MetaMetricsEventName,
 } from '../../../../../shared/constants/metametrics';
 import { NETWORKS_ROUTE } from '../../../../helpers/constants/routes';
 
@@ -65,10 +67,10 @@ export default class AccountDetailsModal extends Component {
     const openBlockExplorer = () => {
       const accountLink = getAccountLink(address, chainId, rpcPrefs);
       this.context.trackEvent({
-        category: EVENT.CATEGORIES.NAVIGATION,
-        event: EVENT_NAMES.EXTERNAL_LINK_CLICKED,
+        category: MetaMetricsEventCategory.Navigation,
+        event: MetaMetricsEventName.ExternalLinkClicked,
         properties: {
-          link_type: EVENT.EXTERNAL_LINK_TYPES.ACCOUNT_TRACKER,
+          link_type: MetaMetricsEventLinkType.AccountTracker,
           location: 'Account Details Modal',
           url_domain: getURLHostName(accountLink),
         },
@@ -115,10 +117,10 @@ export default class AccountDetailsModal extends Component {
             className="account-details-modal__button"
             onClick={() => {
               this.context.trackEvent({
-                category: EVENT.CATEGORIES.ACCOUNTS,
-                event: EVENT_NAMES.KEY_EXPORT_SELECTED,
+                category: MetaMetricsEventCategory.Accounts,
+                event: MetaMetricsEventName.KeyExportSelected,
                 properties: {
-                  key_type: EVENT.KEY_TYPES.PKEY,
+                  key_type: MetaMetricsEventKeyType.Pkey,
                   location: 'Account Details Modal',
                 },
               });
diff --git a/ui/components/app/modals/confirm-remove-account/confirm-remove-account.component.js b/ui/components/app/modals/confirm-remove-account/confirm-remove-account.component.js
index 4d1faea86..e8d8c25cd 100644
--- a/ui/components/app/modals/confirm-remove-account/confirm-remove-account.component.js
+++ b/ui/components/app/modals/confirm-remove-account/confirm-remove-account.component.js
@@ -4,7 +4,7 @@ import { getAccountLink } from '@metamask/etherscan-link';
 import Modal from '../../modal';
 import { addressSummary, getURLHostName } from '../../../../helpers/utils/util';
 import Identicon from '../../../ui/identicon';
-import { EVENT } from '../../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../../shared/constants/metametrics';
 import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
 
 export default class ConfirmRemoveAccount extends Component {
@@ -62,7 +62,7 @@ export default class ConfirmRemoveAccount extends Component {
                 rpcPrefs,
               );
               this.context.trackEvent({
-                category: EVENT.CATEGORIES.ACCOUNTS,
+                category: MetaMetricsEventCategory.Accounts,
                 event: 'Clicked Block Explorer Link',
                 properties: {
                   link_type: 'Account Tracker',
diff --git a/ui/components/app/modals/export-private-key-modal/export-private-key-modal.component.js b/ui/components/app/modals/export-private-key-modal/export-private-key-modal.component.js
index fcd2dde85..81e0dfc4c 100644
--- a/ui/components/app/modals/export-private-key-modal/export-private-key-modal.component.js
+++ b/ui/components/app/modals/export-private-key-modal/export-private-key-modal.component.js
@@ -10,8 +10,9 @@ import {
   stripHexPrefix,
 } from '../../../../../shared/modules/hexstring-utils';
 import {
-  EVENT,
-  EVENT_NAMES,
+  MetaMetricsEventCategory,
+  MetaMetricsEventKeyType,
+  MetaMetricsEventName,
 } from '../../../../../shared/constants/metametrics';
 
 export default class ExportPrivateKeyModal extends Component {
@@ -53,10 +54,10 @@ export default class ExportPrivateKeyModal extends Component {
     exportAccount(password, address)
       .then((privateKey) => {
         this.context.trackEvent({
-          category: EVENT.CATEGORIES.KEYS,
-          event: EVENT_NAMES.KEY_EXPORT_REVEALED,
+          category: MetaMetricsEventCategory.Keys,
+          event: MetaMetricsEventName.KeyExportRevealed,
           properties: {
-            key_type: EVENT.KEY_TYPES.PKEY,
+            key_type: MetaMetricsEventKeyType.Pkey,
           },
         });
 
@@ -67,10 +68,10 @@ export default class ExportPrivateKeyModal extends Component {
       })
       .catch((e) => {
         this.context.trackEvent({
-          category: EVENT.CATEGORIES.KEYS,
-          event: EVENT_NAMES.KEY_EXPORT_FAILED,
+          category: MetaMetricsEventCategory.Keys,
+          event: MetaMetricsEventName.KeyExportFailed,
           properties: {
-            key_type: EVENT.KEY_TYPES.PKEY,
+            key_type: MetaMetricsEventKeyType.Pkey,
             reason: 'incorrect_password',
           },
         });
@@ -108,10 +109,10 @@ export default class ExportPrivateKeyModal extends Component {
         onClick={() => {
           copyToClipboard(plainKey);
           this.context.trackEvent({
-            category: EVENT.CATEGORIES.KEYS,
-            event: EVENT_NAMES.KEY_EXPORT_COPIED,
+            category: MetaMetricsEventCategory.Keys,
+            event: MetaMetricsEventName.KeyExportCopied,
             properties: {
-              key_type: EVENT.KEY_TYPES.PKEY,
+              key_type: MetaMetricsEventKeyType.Pkey,
               copy_method: 'clipboard',
             },
           });
@@ -132,10 +133,10 @@ export default class ExportPrivateKeyModal extends Component {
             className="export-private-key-modal__button export-private-key-modal__button--cancel"
             onClick={() => {
               this.context.trackEvent({
-                category: EVENT.CATEGORIES.KEYS,
-                event: EVENT_NAMES.KEY_EXPORT_CANCELED,
+                category: MetaMetricsEventCategory.Keys,
+                event: MetaMetricsEventName.KeyExportCanceled,
                 properties: {
-                  key_type: EVENT.KEY_TYPES.PKEY,
+                  key_type: MetaMetricsEventKeyType.Pkey,
                 },
               });
               hideModal();
@@ -159,10 +160,10 @@ export default class ExportPrivateKeyModal extends Component {
           <Button
             onClick={() => {
               this.context.trackEvent({
-                category: EVENT.CATEGORIES.KEYS,
-                event: EVENT_NAMES.KEY_EXPORT_REQUESTED,
+                category: MetaMetricsEventCategory.Keys,
+                event: MetaMetricsEventName.KeyExportRequested,
                 properties: {
-                  key_type: EVENT.KEY_TYPES.PKEY,
+                  key_type: MetaMetricsEventKeyType.Pkey,
                 },
               });
 
diff --git a/ui/components/app/permission-page-container/permission-page-container.component.js b/ui/components/app/permission-page-container/permission-page-container.component.js
index 6b28f07cc..806b2c7e2 100644
--- a/ui/components/app/permission-page-container/permission-page-container.component.js
+++ b/ui/components/app/permission-page-container/permission-page-container.component.js
@@ -8,7 +8,7 @@ import {
   WALLET_SNAP_PERMISSION_KEY,
 } from '@metamask/rpc-methods';
 ///: END:ONLY_INCLUDE_IN
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { PageContainerFooter } from '../../ui/page-container';
 import PermissionsConnectFooter from '../permissions-connect-footer';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
@@ -116,7 +116,7 @@ export default class PermissionPageContainer extends Component {
 
   componentDidMount() {
     this.context.trackEvent({
-      category: EVENT.CATEGORIES.AUTH,
+      category: MetaMetricsEventCategory.Auth,
       event: 'Tab Opened',
       properties: {
         action: 'Connect',
diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js
index b1b40b283..92fb56a06 100644
--- a/ui/components/app/signature-request/signature-request.component.js
+++ b/ui/components/app/signature-request/signature-request.component.js
@@ -3,7 +3,7 @@ import { memoize } from 'lodash';
 import PropTypes from 'prop-types';
 import LedgerInstructionField from '../ledger-instruction-field';
 import { sanitizeMessage, getURLHostName } from '../../../helpers/utils/util';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import SiteOrigin from '../../ui/site-origin';
 import Button from '../../ui/button';
 import Typography from '../../ui/typography/typography';
@@ -196,7 +196,7 @@ export default class SignatureRequest extends PureComponent {
     const onSign = (event) => {
       sign(event);
       trackEvent({
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         event: 'Confirm',
         properties: {
           action: 'Sign Request',
@@ -210,7 +210,7 @@ export default class SignatureRequest extends PureComponent {
     const onCancel = (event) => {
       cancel(event);
       trackEvent({
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         event: 'Cancel',
         properties: {
           action: 'Sign Request',
diff --git a/ui/components/app/transaction-activity-log/transaction-activity-log.component.js b/ui/components/app/transaction-activity-log/transaction-activity-log.component.js
index c041f351b..ede7e175e 100644
--- a/ui/components/app/transaction-activity-log/transaction-activity-log.component.js
+++ b/ui/components/app/transaction-activity-log/transaction-activity-log.component.js
@@ -4,7 +4,7 @@ import classnames from 'classnames';
 
 import { getBlockExplorerLink } from '@metamask/etherscan-link';
 import { formatDate, getURLHostName } from '../../../helpers/utils/util';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { getValueFromWeiHex } from '../../../../shared/modules/conversion.utils';
 import TransactionActivityLogIcon from './transaction-activity-log-icon';
 import { CONFIRMED_STATUS } from './transaction-activity-log.constants';
@@ -34,7 +34,7 @@ export default class TransactionActivityLog extends PureComponent {
     const etherscanUrl = getBlockExplorerLink(activity, rpcPrefs);
 
     this.context.trackEvent({
-      category: EVENT.CATEGORIES.TRANSACTIONS,
+      category: MetaMetricsEventCategory.Transactions,
       event: 'Clicked Block Explorer Link',
       properties: {
         link_type: 'Transaction Block Explorer',
diff --git a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
index 7e96ace0e..493b461b8 100644
--- a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
+++ b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
@@ -12,7 +12,7 @@ import Tooltip from '../../ui/tooltip';
 import CancelButton from '../cancel-button';
 import Popover from '../../ui/popover';
 import { SECOND } from '../../../../shared/constants/time';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { TransactionType } from '../../../../shared/constants/transaction';
 import { getURLHostName } from '../../../helpers/utils/util';
 import TransactionDecoding from '../transaction-decoding';
@@ -76,7 +76,7 @@ export default class TransactionListItemDetails extends PureComponent {
       history.push(`${NETWORKS_ROUTE}#blockExplorerUrl`);
     } else {
       this.context.trackEvent({
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         event: 'Clicked Block Explorer Link',
         properties: {
           link_type: 'Transaction Block Explorer',
@@ -109,7 +109,7 @@ export default class TransactionListItemDetails extends PureComponent {
     const { hash } = transaction;
 
     this.context.trackEvent({
-      category: EVENT.CATEGORIES.NAVIGATION,
+      category: MetaMetricsEventCategory.Navigation,
       event: 'Copied Transaction ID',
       properties: {
         action: 'Activity Log',
@@ -250,7 +250,7 @@ export default class TransactionListItemDetails extends PureComponent {
                 senderAddress={senderAddress}
                 onRecipientClick={() => {
                   this.context.trackEvent({
-                    category: EVENT.CATEGORIES.NAVIGATION,
+                    category: MetaMetricsEventCategory.Navigation,
                     event: 'Copied "To" Address',
                     properties: {
                       action: 'Activity Log',
@@ -260,7 +260,7 @@ export default class TransactionListItemDetails extends PureComponent {
                 }}
                 onSenderClick={() => {
                   this.context.trackEvent({
-                    category: EVENT.CATEGORIES.NAVIGATION,
+                    category: MetaMetricsEventCategory.Navigation,
                     event: 'Copied "From" Address',
                     properties: {
                       action: 'Activity Log',
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.js b/ui/components/app/transaction-list-item/transaction-list-item.component.js
index 3166bab54..dc99a7eac 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.js
@@ -13,7 +13,7 @@ import { CONFIRM_TRANSACTION_ROUTE } from '../../../helpers/constants/routes';
 import { useShouldShowSpeedUp } from '../../../hooks/useShouldShowSpeedUp';
 import TransactionStatusLabel from '../transaction-status-label/transaction-status-label';
 import TransactionIcon from '../transaction-icon';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import {
   TransactionGroupCategory,
   TransactionStatus,
@@ -65,7 +65,7 @@ function TransactionListItemInner({
       event.stopPropagation();
       trackEvent({
         event: 'Clicked "Speed Up"',
-        category: EVENT.CATEGORIES.NAVIGATION,
+        category: MetaMetricsEventCategory.Navigation,
         properties: {
           action: 'Activity Log',
           legacy_event: true,
@@ -86,7 +86,7 @@ function TransactionListItemInner({
       event.stopPropagation();
       trackEvent({
         event: 'Clicked "Cancel"',
-        category: EVENT.CATEGORIES.NAVIGATION,
+        category: MetaMetricsEventCategory.Navigation,
         properties: {
           action: 'Activity Log',
           legacy_event: true,
diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js
index 12e69b59b..e3be1754f 100644
--- a/ui/components/app/wallet-overview/eth-overview.js
+++ b/ui/components/app/wallet-overview/eth-overview.js
@@ -29,9 +29,10 @@ import IconButton from '../../ui/icon-button';
 import { isHardwareKeyring } from '../../../helpers/utils/hardware';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsSwapsEventSource,
 } from '../../../../shared/constants/metametrics';
 import Spinner from '../../ui/spinner';
 import { startNewDraftTransaction } from '../../../ducks/send';
@@ -110,15 +111,15 @@ const EthOverview = ({ className }) => {
                   });
                   trackEvent(
                     {
-                      category: EVENT.CATEGORIES.HOME,
-                      event: EVENT_NAMES.PORTFOLIO_LINK_CLICKED,
+                      category: MetaMetricsEventCategory.Home,
+                      event: MetaMetricsEventName.PortfolioLinkClicked,
                       properties: {
                         url: portfolioUrl,
                       },
                     },
                     {
                       contextPropsIntoEventProperties: [
-                        CONTEXT_PROPS.PAGE_TITLE,
+                        MetaMetricsContextProp.PageTitle,
                       ],
                     },
                   );
@@ -154,8 +155,8 @@ const EthOverview = ({ className }) => {
             onClick={() => {
               openBuyCryptoInPdapp();
               trackEvent({
-                event: EVENT_NAMES.NAV_BUY_BUTTON_CLICKED,
-                category: EVENT.CATEGORIES.NAVIGATION,
+                event: MetaMetricsEventName.NavBuyButtonClicked,
+                category: MetaMetricsEventCategory.Navigation,
                 properties: {
                   location: 'Home',
                   text: 'Buy',
@@ -175,8 +176,8 @@ const EthOverview = ({ className }) => {
             label={t('send')}
             onClick={() => {
               trackEvent({
-                event: EVENT_NAMES.NAV_SEND_BUTTON_CLICKED,
-                category: EVENT.CATEGORIES.NAVIGATION,
+                event: MetaMetricsEventName.NavSendButtonClicked,
+                category: MetaMetricsEventCategory.Navigation,
                 properties: {
                   token_symbol: 'ETH',
                   location: 'Home',
@@ -202,11 +203,11 @@ const EthOverview = ({ className }) => {
             onClick={() => {
               if (isSwapsChain) {
                 trackEvent({
-                  event: EVENT_NAMES.NAV_SWAP_BUTTON_CLICKED,
-                  category: EVENT.CATEGORIES.SWAPS,
+                  event: MetaMetricsEventName.NavSwapButtonClicked,
+                  category: MetaMetricsEventCategory.Swaps,
                   properties: {
                     token_symbol: 'ETH',
-                    location: EVENT.SOURCE.SWAPS.MAIN_VIEW,
+                    location: MetaMetricsSwapsEventSource.MainView,
                     text: 'Swap',
                   },
                 });
@@ -248,8 +249,8 @@ const EthOverview = ({ className }) => {
                   url: `${bridgeUrl}?metamaskEntry=ext`,
                 });
                 trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
-                  event: EVENT_NAMES.BRIDGE_LINK_CLICKED,
+                  category: MetaMetricsEventCategory.Navigation,
+                  event: MetaMetricsEventName.BridgeLinkClicked,
                   properties: {
                     location: 'Home',
                     text: 'Bridge',
diff --git a/ui/components/app/wallet-overview/token-overview.js b/ui/components/app/wallet-overview/token-overview.js
index 4c7fc481d..5f7d2cc05 100644
--- a/ui/components/app/wallet-overview/token-overview.js
+++ b/ui/components/app/wallet-overview/token-overview.js
@@ -27,9 +27,10 @@ import { INVALID_ASSET_TYPE } from '../../../helpers/constants/error-keys';
 import { showModal } from '../../../store/actions';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsSwapsEventSource,
 } from '../../../../shared/constants/metametrics';
 import { AssetType } from '../../../../shared/constants/transaction';
 import useRamps from '../../../hooks/experiences/useRamps';
@@ -100,8 +101,8 @@ const TokenOverview = ({ className, token }) => {
             onClick={() => {
               openBuyCryptoInPdapp();
               trackEvent({
-                event: EVENT_NAMES.NAV_BUY_BUTTON_CLICKED,
-                category: EVENT.CATEGORIES.NAVIGATION,
+                event: MetaMetricsEventName.NavBuyButtonClicked,
+                category: MetaMetricsEventCategory.Navigation,
                 properties: {
                   location: 'Token Overview',
                   text: 'Buy',
@@ -114,11 +115,11 @@ const TokenOverview = ({ className, token }) => {
             className="token-overview__button"
             onClick={async () => {
               trackEvent({
-                event: EVENT_NAMES.NAV_SEND_BUTTON_CLICKED,
-                category: EVENT.CATEGORIES.NAVIGATION,
+                event: MetaMetricsEventName.NavSendButtonClicked,
+                category: MetaMetricsEventCategory.Navigation,
                 properties: {
                   token_symbol: token.symbol,
-                  location: EVENT.SOURCE.SWAPS.TOKEN_VIEW,
+                  location: MetaMetricsSwapsEventSource.TokenView,
                   text: 'Send',
                 },
               });
@@ -158,11 +159,11 @@ const TokenOverview = ({ className, token }) => {
             onClick={() => {
               if (isSwapsChain) {
                 trackEvent({
-                  event: EVENT_NAMES.NAV_SWAP_BUTTON_CLICKED,
-                  category: EVENT.CATEGORIES.SWAPS,
+                  event: MetaMetricsEventName.NavSwapButtonClicked,
+                  category: MetaMetricsEventCategory.Swaps,
                   properties: {
                     token_symbol: token.symbol,
-                    location: EVENT.SOURCE.SWAPS.TOKEN_VIEW,
+                    location: MetaMetricsSwapsEventSource.TokenView,
                     text: 'Swap',
                   },
                 });
@@ -214,14 +215,16 @@ const TokenOverview = ({ className, token }) => {
               });
               trackEvent(
                 {
-                  category: EVENT.CATEGORIES.HOME,
-                  event: EVENT_NAMES.PORTFOLIO_LINK_CLICKED,
+                  category: MetaMetricsEventCategory.Home,
+                  event: MetaMetricsEventName.PortfolioLinkClicked,
                   properties: {
                     url: portfolioUrl,
                   },
                 },
                 {
-                  contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+                  contextPropsIntoEventProperties: [
+                    MetaMetricsContextProp.PageTitle,
+                  ],
                 },
               );
             }}
diff --git a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
index 2d02363b6..3b0e3d59a 100644
--- a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
+++ b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
@@ -13,7 +13,11 @@ import {
 import { NETWORKS_ROUTE } from '../../../helpers/constants/routes';
 import { Menu, MenuItem } from '../../ui/menu';
 import { ICON_NAMES, Text } from '../../component-library';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventLinkType,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { getURLHostName } from '../../../helpers/utils/util';
 import { showModal } from '../../../store/actions';
 import { TextVariant } from '../../../helpers/constants/design-system';
@@ -38,10 +42,10 @@ export const AccountListItemMenu = ({
   const blockExplorerLinkText = useSelector(getBlockExplorerLinkText);
   const openBlockExplorer = () => {
     trackEvent({
-      event: EVENT_NAMES.EXTERNAL_LINK_CLICKED,
-      category: EVENT.CATEGORIES.NAVIGATION,
+      event: MetaMetricsEventName.ExternalLinkClicked,
+      category: MetaMetricsEventCategory.Navigation,
       properties: {
-        link_type: EVENT.EXTERNAL_LINK_TYPES.ACCOUNT_TRACKER,
+        link_type: MetaMetricsEventLinkType.AccountTracker,
         location: 'Account Options',
         url_domain: getURLHostName(addressLink),
       },
@@ -78,8 +82,8 @@ export const AccountListItemMenu = ({
         onClick={() => {
           dispatch(showModal({ name: 'ACCOUNT_DETAILS' }));
           trackEvent({
-            event: EVENT_NAMES.NAV_ACCOUNT_DETAILS_OPENED,
-            category: EVENT.CATEGORIES.NAVIGATION,
+            event: MetaMetricsEventName.NavAccountDetailsOpened,
+            category: MetaMetricsEventCategory.Navigation,
             properties: {
               location: 'Account Options',
             },
diff --git a/ui/components/multichain/account-list-menu/account-list-menu.js b/ui/components/multichain/account-list-menu/account-list-menu.js
index 10d48a057..03f6428f4 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.js
+++ b/ui/components/multichain/account-list-menu/account-list-menu.js
@@ -26,7 +26,11 @@ import {
   getOriginOfCurrentTab,
 } from '../../../selectors';
 import { toggleAccountMenu, setSelectedAccount } from '../../../store/actions';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventAccountType,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import {
   IMPORT_ACCOUNT_ROUTE,
   NEW_ACCOUNT_ROUTE,
@@ -96,8 +100,8 @@ export const AccountListMenu = ({ onClose }) => {
                 onClick={() => {
                   dispatch(toggleAccountMenu());
                   trackEvent({
-                    category: EVENT.CATEGORIES.NAVIGATION,
-                    event: EVENT_NAMES.NAV_ACCOUNT_SWITCHED,
+                    category: MetaMetricsEventCategory.Navigation,
+                    event: MetaMetricsEventName.NavAccountSwitched,
                     properties: {
                       location: 'Main Menu',
                     },
@@ -124,10 +128,10 @@ export const AccountListMenu = ({ onClose }) => {
               onClick={() => {
                 dispatch(toggleAccountMenu());
                 trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
-                  event: EVENT_NAMES.ACCOUNT_ADD_SELECTED,
+                  category: MetaMetricsEventCategory.Navigation,
+                  event: MetaMetricsEventName.AccountAddSelected,
                   properties: {
-                    account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
+                    account_type: MetaMetricsEventAccountType.Default,
                     location: 'Main Menu',
                   },
                 });
@@ -144,10 +148,10 @@ export const AccountListMenu = ({ onClose }) => {
               onClick={() => {
                 dispatch(toggleAccountMenu());
                 trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
-                  event: EVENT_NAMES.ACCOUNT_ADD_SELECTED,
+                  category: MetaMetricsEventCategory.Navigation,
+                  event: MetaMetricsEventName.AccountAddSelected,
                   properties: {
-                    account_type: EVENT.ACCOUNT_TYPES.IMPORTED,
+                    account_type: MetaMetricsEventAccountType.Imported,
                     location: 'Main Menu',
                   },
                 });
@@ -164,10 +168,10 @@ export const AccountListMenu = ({ onClose }) => {
               onClick={() => {
                 dispatch(toggleAccountMenu());
                 trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
-                  event: EVENT_NAMES.ACCOUNT_ADD_SELECTED,
+                  category: MetaMetricsEventCategory.Navigation,
+                  event: MetaMetricsEventName.AccountAddSelected,
                   properties: {
-                    account_type: EVENT.ACCOUNT_TYPES.HARDWARE,
+                    account_type: MetaMetricsEventAccountType.Hardware,
                     location: 'Main Menu',
                   },
                 });
diff --git a/ui/components/multichain/detected-token-banner/detected-token-banner.js b/ui/components/multichain/detected-token-banner/detected-token-banner.js
index 790630ef7..298f7196a 100644
--- a/ui/components/multichain/detected-token-banner/detected-token-banner.js
+++ b/ui/components/multichain/detected-token-banner/detected-token-banner.js
@@ -6,7 +6,11 @@ import classNames from 'classnames';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getDetectedTokensInCurrentNetwork } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsTokenEventSource,
+} from '../../../../shared/constants/metametrics';
 import { BannerAlert } from '../../component-library';
 
 export const DetectedTokensBanner = ({
@@ -25,10 +29,10 @@ export const DetectedTokensBanner = ({
   const handleOnClick = () => {
     actionButtonOnClick();
     trackEvent({
-      event: EVENT_NAMES.TOKEN_IMPORT_CLICKED,
-      category: EVENT.CATEGORIES.WALLET,
+      event: MetaMetricsEventName.TokenImportClicked,
+      category: MetaMetricsEventCategory.Wallet,
       properties: {
-        source: EVENT.SOURCE.TOKEN.DETECTED,
+        source: MetaMetricsTokenEventSource.Detected,
         tokens: detectedTokensDetails,
       },
     });
diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js
index 4c2f738b9..31621804d 100644
--- a/ui/components/multichain/global-menu/global-menu.js
+++ b/ui/components/multichain/global-menu/global-menu.js
@@ -17,9 +17,9 @@ import { SUPPORT_LINK } from '../../../../shared/lib/ui-utils';
 
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
-  EVENT_NAMES,
-  EVENT,
-  CONTEXT_PROPS,
+  MetaMetricsEventName,
+  MetaMetricsEventCategory,
+  MetaMetricsContextProp,
 } from '../../../../shared/constants/metametrics';
 
 export const GlobalMenu = ({ closeMenu, anchorElement }) => {
@@ -35,8 +35,8 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => {
         onClick={() => {
           history.push(CONNECTED_ROUTE);
           trackEvent({
-            event: EVENT_NAMES.NAV_CONNECTED_SITES_OPENED,
-            category: EVENT.CATEGORIES.NAVIGATION,
+            event: MetaMetricsEventName.NavConnectedSitesOpened,
+            category: MetaMetricsEventCategory.Navigation,
             properties: {
               location: 'Account Options',
             },
@@ -55,14 +55,16 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => {
           });
           trackEvent(
             {
-              category: EVENT.CATEGORIES.HOME,
-              event: EVENT_NAMES.PORTFOLIO_LINK_CLICKED,
+              category: MetaMetricsEventCategory.Home,
+              event: MetaMetricsEventName.PortfolioLinkClicked,
               properties: {
                 url: portfolioUrl,
               },
             },
             {
-              contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+              contextPropsIntoEventProperties: [
+                MetaMetricsContextProp.PageTitle,
+              ],
             },
           );
           closeMenu();
@@ -77,8 +79,8 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => {
           onClick={() => {
             global.platform.openExtensionInBrowser();
             trackEvent({
-              event: EVENT_NAMES.APP_WINDOW_EXPANDED,
-              category: EVENT.CATEGORIES.NAVIGATION,
+              event: MetaMetricsEventName.AppWindowExpanded,
+              category: MetaMetricsEventCategory.Navigation,
               properties: {
                 location: 'Account Options',
               },
@@ -96,14 +98,16 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => {
           global.platform.openTab({ url: SUPPORT_LINK });
           trackEvent(
             {
-              category: EVENT.CATEGORIES.HOME,
-              event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+              category: MetaMetricsEventCategory.Home,
+              event: MetaMetricsEventName.SupportLinkClicked,
               properties: {
                 url: SUPPORT_LINK,
               },
             },
             {
-              contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+              contextPropsIntoEventProperties: [
+                MetaMetricsContextProp.PageTitle,
+              ],
             },
           );
           closeMenu();
@@ -117,8 +121,8 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => {
         onClick={() => {
           history.push(SETTINGS_ROUTE);
           trackEvent({
-            category: EVENT.CATEGORIES.NAVIGATION,
-            event: EVENT_NAMES.NAV_SETTINGS_OPENED,
+            category: MetaMetricsEventCategory.Navigation,
+            event: MetaMetricsEventName.NavSettingsOpened,
             properties: {
               location: 'Main Menu',
             },
diff --git a/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.js b/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.js
index fc6dae84a..b2da9f54f 100644
--- a/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.js
+++ b/ui/components/multichain/multichain-import-token-link/multichain-import-token-link.js
@@ -14,7 +14,10 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import { IMPORT_TOKEN_ROUTE } from '../../../helpers/constants/routes';
 import { detectNewTokens } from '../../../store/actions';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import {
   getIsTokenDetectionSupported,
   getIsTokenDetectionInactiveOnMainnet,
@@ -47,8 +50,8 @@ export const MultichainImportTokenLink = ({ className, ...props }) => {
           onClick={() => {
             history.push(IMPORT_TOKEN_ROUTE);
             trackEvent({
-              event: EVENT_NAMES.TOKEN_IMPORT_BUTTON_CLICKED,
-              category: EVENT.CATEGORIES.NAVIGATION,
+              event: MetaMetricsEventName.TokenImportButtonClicked,
+              category: MetaMetricsEventCategory.Navigation,
               properties: {
                 location: 'Home',
               },
diff --git a/ui/contexts/metametrics.js b/ui/contexts/metametrics.js
index fd3d15265..ac1f0c776 100644
--- a/ui/contexts/metametrics.js
+++ b/ui/contexts/metametrics.js
@@ -17,7 +17,7 @@ import { captureException, captureMessage } from '@sentry/browser';
 import { omit } from 'lodash';
 import { getEnvironmentType } from '../../app/scripts/lib/util';
 import { PATH_NAME_MAP } from '../helpers/constants/routes';
-import { CONTEXT_PROPS } from '../../shared/constants/metametrics';
+import { MetaMetricsContextProp } from '../../shared/constants/metametrics';
 import { useSegmentContext } from '../hooks/useSegmentContext';
 
 import { trackMetaMetricsEvent, trackMetaMetricsPage } from '../store/actions';
@@ -67,8 +67,9 @@ export function MetaMetricsProvider({ children }) {
     if (!payload.properties) {
       payload.properties = {};
     }
-    if (fields.includes(CONTEXT_PROPS.PAGE_TITLE)) {
-      payload.properties[CONTEXT_PROPS.PAGE_TITLE] = context.page?.title;
+    if (fields.includes(MetaMetricsContextProp.PageTitle)) {
+      payload.properties[MetaMetricsContextProp.PageTitle] =
+        context.page?.title;
     }
   };
 
diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js
index 803d1a19d..6f5252bc2 100644
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@@ -69,7 +69,7 @@ import {
   checkNetworkAndAccountSupports1559,
 } from '../../selectors';
 
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import {
   ERROR_FETCHING_QUOTES,
   QUOTES_NOT_AVAILABLE_ERROR,
@@ -726,7 +726,7 @@ export const fetchQuotesAndSetQuoteState = (
       getCurrentSmartTransactionsEnabled(state);
     trackEvent({
       event: 'Quotes Requested',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         token_from: fromTokenSymbol,
         token_from_amount: String(inputValue),
@@ -780,7 +780,7 @@ export const fetchQuotesAndSetQuoteState = (
       if (Object.values(fetchedQuotes)?.length === 0) {
         trackEvent({
           event: 'No Quotes Available',
-          category: EVENT.CATEGORIES.SWAPS,
+          category: MetaMetricsEventCategory.Swaps,
           sensitiveProperties: {
             token_from: fromTokenSymbol,
             token_from_amount: String(inputValue),
@@ -801,7 +801,7 @@ export const fetchQuotesAndSetQuoteState = (
 
         trackEvent({
           event: 'Quotes Received',
-          category: EVENT.CATEGORIES.SWAPS,
+          category: MetaMetricsEventCategory.Swaps,
           sensitiveProperties: {
             token_from: fromTokenSymbol,
             token_from_amount: String(inputValue),
@@ -902,7 +902,7 @@ export const signAndSendSwapsSmartTransaction = ({
     };
     trackEvent({
       event: 'STX Swap Started',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: swapMetaData,
     });
 
@@ -1159,7 +1159,7 @@ export const signAndSendTransactions = (
 
     trackEvent({
       event: 'Swap Started',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: swapMetaData,
     });
 
diff --git a/ui/pages/add-nft/add-nft.js b/ui/pages/add-nft/add-nft.js
index 138ba3b99..963c7b61a 100644
--- a/ui/pages/add-nft/add-nft.js
+++ b/ui/pages/add-nft/add-nft.js
@@ -32,7 +32,10 @@ import { getNftsDropdownState } from '../../ducks/metamask/metamask';
 import NftsDetectionNotice from '../../components/app/nfts-detection-notice';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import { AssetType } from '../../../shared/constants/transaction';
-import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventName,
+  MetaMetricsTokenEventSource,
+} from '../../../shared/constants/metametrics';
 import {
   ButtonIcon,
   ICON_NAMES,
@@ -101,7 +104,7 @@ export default function AddNft() {
     );
 
     trackEvent({
-      event: EVENT_NAMES.TOKEN_ADDED,
+      event: MetaMetricsEventName.TokenAdded,
       category: 'Wallet',
       sensitiveProperties: {
         token_contract_address: nftAddress,
@@ -109,7 +112,7 @@ export default function AddNft() {
         tokenId: tokenId.toString(),
         asset_type: AssetType.NFT,
         token_standard: tokenDetails?.standard,
-        source: EVENT.SOURCE.TOKEN.CUSTOM,
+        source: MetaMetricsTokenEventSource.Custom,
       },
     });
 
diff --git a/ui/pages/asset/components/native-asset.js b/ui/pages/asset/components/native-asset.js
index 7d59816b9..0d5d6f98b 100644
--- a/ui/pages/asset/components/native-asset.js
+++ b/ui/pages/asset/components/native-asset.js
@@ -16,7 +16,7 @@ import { showModal } from '../../../store/actions';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { getURLHostName } from '../../../helpers/utils/util';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import AssetNavigation from './asset-navigation';
 import AssetOptions from './asset-options';
 
@@ -46,7 +46,7 @@ export default function NativeAsset({ nativeCurrency }) {
             onClickBlockExplorer={() => {
               trackEvent({
                 event: 'Clicked Block Explorer Link',
-                category: EVENT.CATEGORIES.NAVIGATION,
+                category: MetaMetricsEventCategory.Navigation,
                 properties: {
                   link_type: 'Account Tracker',
                   action: 'Asset Options',
diff --git a/ui/pages/asset/components/token-asset.js b/ui/pages/asset/components/token-asset.js
index 3b26cb359..2df9c17ac 100644
--- a/ui/pages/asset/components/token-asset.js
+++ b/ui/pages/asset/components/token-asset.js
@@ -18,7 +18,7 @@ import {
 import { getURLHostName } from '../../../helpers/utils/util';
 import { showModal } from '../../../store/actions';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import AssetNavigation from './asset-navigation';
 import AssetOptions from './asset-options';
 
@@ -58,7 +58,7 @@ export default function TokenAsset({ token }) {
             onClickBlockExplorer={() => {
               trackEvent({
                 event: 'Clicked Block Explorer Link',
-                category: EVENT.CATEGORIES.NAVIGATION,
+                category: MetaMetricsEventCategory.Navigation,
                 properties: {
                   link_type: 'Token Tracker',
                   action: 'Token Options',
diff --git a/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js b/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
index 979193b09..bba7aedc5 100644
--- a/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
+++ b/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
@@ -14,7 +14,11 @@ import ZENDESK_URLS from '../../helpers/constants/zendesk-url';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { getSuggestedAssets } from '../../selectors';
 import { rejectWatchAsset, acceptWatchAsset } from '../../store/actions';
-import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsTokenEventSource,
+} from '../../../shared/constants/metametrics';
 import {
   AssetType,
   TokenStandard,
@@ -118,14 +122,14 @@ const ConfirmAddSuggestedToken = () => {
         await dispatch(acceptWatchAsset(id));
 
         trackEvent({
-          event: EVENT_NAMES.TOKEN_ADDED,
-          category: EVENT.CATEGORIES.WALLET,
+          event: MetaMetricsEventName.TokenAdded,
+          category: MetaMetricsEventCategory.Wallet,
           sensitiveProperties: {
             token_symbol: asset.symbol,
             token_contract_address: asset.address,
             token_decimal_precision: asset.decimals,
             unlisted: asset.unlisted,
-            source: EVENT.SOURCE.TOKEN.DAPP,
+            source: MetaMetricsTokenEventSource.Dapp,
             token_standard: TokenStandard.ERC20,
             asset_type: AssetType.token,
           },
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
index 49e0acb97..31828f218 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
@@ -9,7 +9,7 @@ import Identicon from '../../components/ui/identicon';
 import Tooltip from '../../components/ui/tooltip';
 import { PageContainerFooter } from '../../components/ui/page-container';
 
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import { SECOND } from '../../../shared/constants/time';
 import { Numeric } from '../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../shared/constants/common';
@@ -52,7 +52,7 @@ export default class ConfirmDecryptMessage extends Component {
   copyMessage = () => {
     copyToClipboard(this.state.rawMessage);
     this.context.trackEvent({
-      category: EVENT.CATEGORIES.MESSAGES,
+      category: MetaMetricsEventCategory.Messages,
       event: 'Copy',
       properties: {
         action: 'Decrypt Message Copy',
@@ -286,7 +286,7 @@ export default class ConfirmDecryptMessage extends Component {
         onCancel={async (event) => {
           await cancelDecryptMessage(txData, event);
           trackEvent({
-            category: EVENT.CATEGORIES.MESSAGES,
+            category: MetaMetricsEventCategory.Messages,
             event: 'Cancel',
             properties: {
               action: 'Decrypt Message Request',
@@ -299,7 +299,7 @@ export default class ConfirmDecryptMessage extends Component {
         onSubmit={async (event) => {
           await decryptMessage(txData, event);
           trackEvent({
-            category: EVENT.CATEGORIES.MESSAGES,
+            category: MetaMetricsEventCategory.Messages,
             event: 'Confirm',
             properties: {
               action: 'Decrypt Message Request',
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
index 262fd2958..1595576a4 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
@@ -6,7 +6,7 @@ import AccountListItem from '../../components/app/account-list-item';
 import Identicon from '../../components/ui/identicon';
 import { PageContainerFooter } from '../../components/ui/page-container';
 
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import SiteOrigin from '../../components/ui/site-origin';
 import { Numeric } from '../../../shared/modules/Numeric';
 import { EtherDenomination } from '../../../shared/constants/common';
@@ -185,7 +185,7 @@ export default class ConfirmEncryptionPublicKey extends Component {
         onCancel={async (event) => {
           await cancelEncryptionPublicKey(txData, event);
           trackEvent({
-            category: EVENT.CATEGORIES.MESSAGES,
+            category: MetaMetricsEventCategory.Messages,
             event: 'Cancel',
             properties: {
               action: 'Encryption public key Request',
@@ -198,7 +198,7 @@ export default class ConfirmEncryptionPublicKey extends Component {
         onSubmit={async (event) => {
           await encryptionPublicKey(txData, event);
           this.context.trackEvent({
-            category: EVENT.CATEGORIES.MESSAGES,
+            category: MetaMetricsEventCategory.Messages,
             event: 'Confirm',
             properties: {
               action: 'Encryption public key Request',
diff --git a/ui/pages/confirm-import-token/confirm-import-token.js b/ui/pages/confirm-import-token/confirm-import-token.js
index 5a340cbb1..61bc41ff4 100644
--- a/ui/pages/confirm-import-token/confirm-import-token.js
+++ b/ui/pages/confirm-import-token/confirm-import-token.js
@@ -13,7 +13,11 @@ import { MetaMetricsContext } from '../../contexts/metametrics';
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
 import { getPendingTokens } from '../../ducks/metamask/metamask';
 import { addTokens, clearPendingTokens } from '../../store/actions';
-import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+  MetaMetricsTokenEventSource,
+} from '../../../shared/constants/metametrics';
 import {
   AssetType,
   TokenStandard,
@@ -40,16 +44,16 @@ const ConfirmImportToken = () => {
 
     addedTokenValues.forEach((pendingToken) => {
       trackEvent({
-        event: EVENT_NAMES.TOKEN_ADDED,
-        category: EVENT.CATEGORIES.WALLET,
+        event: MetaMetricsEventName.TokenAdded,
+        category: MetaMetricsEventCategory.Wallet,
         sensitiveProperties: {
           token_symbol: pendingToken.symbol,
           token_contract_address: pendingToken.address,
           token_decimal_precision: pendingToken.decimals,
           unlisted: pendingToken.unlisted,
           source: pendingToken.isCustom
-            ? EVENT.SOURCE.TOKEN.CUSTOM
-            : EVENT.SOURCE.TOKEN.LIST,
+            ? MetaMetricsTokenEventSource.Custom
+            : MetaMetricsTokenEventSource.List,
           token_standard: TokenStandard.ERC20,
           asset_type: AssetType.token,
         },
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
index 71af5be39..78fc1d984 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -14,7 +14,7 @@ import UserPreferencedCurrencyDisplay from '../../components/app/user-preference
 import { PRIMARY, SECONDARY } from '../../helpers/constants/common';
 import TextField from '../../components/ui/text-field';
 import SimulationErrorMessage from '../../components/ui/simulation-error-message';
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import {
   TransactionType,
   TransactionStatus,
@@ -279,7 +279,7 @@ export default class ConfirmTransactionBase extends Component {
     } = this.props;
 
     this.context.trackEvent({
-      category: EVENT.CATEGORIES.TRANSACTIONS,
+      category: MetaMetricsEventCategory.Transactions,
       event: 'User clicks "Edit" on gas',
       properties: {
         action: 'Confirm Screen',
@@ -672,7 +672,7 @@ export default class ConfirmTransactionBase extends Component {
     } = this.props;
 
     this.context.trackEvent({
-      category: EVENT.CATEGORIES.TRANSACTIONS,
+      category: MetaMetricsEventCategory.Transactions,
       event: 'Edit Transaction',
       properties: {
         action: 'Confirm Screen',
@@ -881,7 +881,7 @@ export default class ConfirmTransactionBase extends Component {
     } = this.props;
     const { trackEvent } = this.context;
     trackEvent({
-      category: EVENT.CATEGORIES.TRANSACTIONS,
+      category: MetaMetricsEventCategory.Transactions,
       event: 'Confirm: Started',
       properties: {
         action: 'Confirm Screen',
diff --git a/ui/pages/create-account/connect-hardware/account-list.js b/ui/pages/create-account/connect-hardware/account-list.js
index 2fe153ca0..597d7e0f4 100644
--- a/ui/pages/create-account/connect-hardware/account-list.js
+++ b/ui/pages/create-account/connect-hardware/account-list.js
@@ -9,7 +9,7 @@ import Dropdown from '../../../components/ui/dropdown';
 import { getURLHostName } from '../../../helpers/utils/util';
 
 import { HardwareDeviceNames } from '../../../../shared/constants/hardware-wallets';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 
 class AccountList extends Component {
   state = {
@@ -137,7 +137,7 @@ class AccountList extends Component {
                     rpcPrefs,
                   );
                   this.context.trackEvent({
-                    category: EVENT.CATEGORIES.ACCOUNTS,
+                    category: MetaMetricsEventCategory.Accounts,
                     event: 'Clicked Block Explorer Link',
                     properties: {
                       actions: 'Hardware Connect',
diff --git a/ui/pages/create-account/connect-hardware/index.js b/ui/pages/create-account/connect-hardware/index.js
index 93776d715..c46800f85 100644
--- a/ui/pages/create-account/connect-hardware/index.js
+++ b/ui/pages/create-account/connect-hardware/index.js
@@ -10,7 +10,11 @@ import {
 } from '../../../selectors';
 import { formatBalance } from '../../../helpers/utils/util';
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventAccountType,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { SECOND } from '../../../../shared/constants/time';
 import {
   HardwareDeviceNames,
@@ -253,10 +257,10 @@ class ConnectHardwareForm extends Component {
     )
       .then((_) => {
         this.context.trackEvent({
-          category: EVENT.CATEGORIES.ACCOUNTS,
-          event: EVENT_NAMES.ACCOUNT_ADDED,
+          category: MetaMetricsEventCategory.Accounts,
+          event: MetaMetricsEventName.AccountAdded,
           properties: {
-            account_type: EVENT.ACCOUNT_TYPES.HARDWARE,
+            account_type: MetaMetricsEventAccountType.Hardware,
             account_hardware_type: device,
           },
         });
@@ -264,10 +268,10 @@ class ConnectHardwareForm extends Component {
       })
       .catch((e) => {
         this.context.trackEvent({
-          category: EVENT.CATEGORIES.ACCOUNTS,
-          event: EVENT_NAMES.ACCOUNT_ADD_FAILED,
+          category: MetaMetricsEventCategory.Accounts,
+          event: MetaMetricsEventName.AccountAddFailed,
           properties: {
-            account_type: EVENT.ACCOUNT_TYPES.HARDWARE,
+            account_type: MetaMetricsEventAccountType.Hardware,
             account_hardware_type: device,
             error: e.message,
           },
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index f5cc5c338..9cb027eb9 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -14,7 +14,7 @@ import {
   HardwareAffiliateTutorialLinks,
 } from '../../../../shared/constants/hardware-wallets';
 import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { isManifestV3 } from '../../../../shared/modules/mv3.utils';
 import { openWindow } from '../../../helpers/utils/window';
 
@@ -242,7 +242,7 @@ export default class SelectHardware extends Component {
                   type="secondary"
                   onClick={() => {
                     this.context.trackEvent({
-                      category: EVENT.CATEGORIES.NAVIGATION,
+                      category: MetaMetricsEventCategory.Navigation,
                       event: 'Clicked Ledger Buy Now',
                     });
                     openWindow(HardwareAffiliateLinks.ledger);
@@ -255,7 +255,7 @@ export default class SelectHardware extends Component {
                   type="secondary"
                   onClick={() => {
                     this.context.trackEvent({
-                      category: EVENT.CATEGORIES.NAVIGATION,
+                      category: MetaMetricsEventCategory.Navigation,
                       event: 'Clicked Ledger Tutorial',
                     });
                     openWindow(HardwareAffiliateTutorialLinks.ledger);
@@ -310,7 +310,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked GridPlus Buy Now',
                 });
                 openWindow(HardwareAffiliateLinks.gridplus);
@@ -323,7 +323,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked GidPlus Tutorial',
                 });
                 openWindow(HardwareAffiliateTutorialLinks.gridplus);
@@ -376,7 +376,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked Trezor Buy Now',
                 });
                 openWindow(HardwareAffiliateLinks.trezor);
@@ -389,7 +389,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked Trezor Tutorial',
                 });
                 openWindow(HardwareAffiliateTutorialLinks.trezor);
@@ -430,7 +430,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked Keystone Buy Now',
                 });
                 openWindow(HardwareAffiliateLinks.keystone);
@@ -443,7 +443,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked Keystone Tutorial',
                 });
                 openWindow(HardwareAffiliateTutorialLinks.keystone);
@@ -465,7 +465,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked AirGap Vault Buy Now',
                 });
                 openWindow(HardwareAffiliateLinks.airgap);
@@ -478,7 +478,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked AirGap Vault Tutorial',
                 });
                 openWindow(HardwareAffiliateTutorialLinks.airgap);
@@ -500,7 +500,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked CoolWallet Buy Now',
                 });
                 openWindow(HardwareAffiliateLinks.coolwallet);
@@ -513,7 +513,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked CoolWallet Tutorial',
                 });
                 openWindow(HardwareAffiliateTutorialLinks.coolwallet);
@@ -533,7 +533,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked DCent Buy Now',
                 });
                 openWindow(HardwareAffiliateLinks.dcent);
@@ -546,7 +546,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => {
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.NAVIGATION,
+                  category: MetaMetricsEventCategory.Navigation,
                   event: 'Clicked DCent Tutorial',
                 });
                 openWindow(HardwareAffiliateTutorialLinks.dcent);
diff --git a/ui/pages/create-account/import-account/import-account.js b/ui/pages/create-account/import-account/import-account.js
index fdba6f563..d47e7fc5f 100644
--- a/ui/pages/create-account/import-account/import-account.js
+++ b/ui/pages/create-account/import-account/import-account.js
@@ -1,6 +1,11 @@
 import React, { useContext, useState } from 'react';
 import { useDispatch } from 'react-redux';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventAccountImportType,
+  MetaMetricsEventAccountType,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { ButtonLink, Label, Text } from '../../../components/component-library';
 import Box from '../../../components/ui/box';
 import Dropdown from '../../../components/ui/dropdown';
@@ -52,18 +57,18 @@ export default function NewAccountImportForm() {
   function trackImportEvent(strategy, wasSuccessful) {
     const accountImportType =
       strategy === 'Private Key'
-        ? EVENT.ACCOUNT_IMPORT_TYPES.PRIVATE_KEY
-        : EVENT.ACCOUNT_IMPORT_TYPES.JSON;
+        ? MetaMetricsEventAccountImportType.PrivateKey
+        : MetaMetricsEventAccountImportType.Json;
 
     const event = wasSuccessful
-      ? EVENT_NAMES.ACCOUNT_ADDED
-      : EVENT_NAMES.ACCOUNT_ADD_FAILED;
+      ? MetaMetricsEventName.AccountAdded
+      : MetaMetricsEventName.AccountAddFailed;
 
     trackEvent({
-      category: EVENT.CATEGORIES.ACCOUNTS,
+      category: MetaMetricsEventCategory.Accounts,
       event,
       properties: {
-        account_type: EVENT.ACCOUNT_TYPES.IMPORTED,
+        account_type: MetaMetricsEventAccountType.Imported,
         account_import_type: accountImportType,
       },
     });
diff --git a/ui/pages/create-account/new-account.component.js b/ui/pages/create-account/new-account.component.js
index a9974d46d..0c219d7c3 100644
--- a/ui/pages/create-account/new-account.component.js
+++ b/ui/pages/create-account/new-account.component.js
@@ -2,7 +2,11 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import Button from '../../components/ui/button';
-import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventAccountType,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../shared/constants/metametrics';
 import { getAccountNameErrorMessage } from '../../helpers/utils/accounts';
 
 export default class NewAccountCreateForm extends Component {
@@ -27,20 +31,20 @@ export default class NewAccountCreateForm extends Component {
       createAccount(newAccountName || defaultAccountName)
         .then(() => {
           this.context.trackEvent({
-            category: EVENT.CATEGORIES.ACCOUNTS,
-            event: EVENT_NAMES.ACCOUNT_ADDED,
+            category: MetaMetricsEventCategory.Accounts,
+            event: MetaMetricsEventName.AccountAdded,
             properties: {
-              account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
+              account_type: MetaMetricsEventAccountType.Default,
             },
           });
           history.push(mostRecentOverviewPage);
         })
         .catch((e) => {
           this.context.trackEvent({
-            category: EVENT.CATEGORIES.ACCOUNTS,
-            event: EVENT_NAMES.ACCOUNT_ADD_FAILED,
+            category: MetaMetricsEventCategory.Accounts,
+            event: MetaMetricsEventName.AccountAddFailed,
             properties: {
-              account_type: EVENT.ACCOUNT_TYPES.DEFAULT,
+              account_type: MetaMetricsEventAccountType.Default,
               error: e.message,
             },
           });
diff --git a/ui/pages/desktop-error/render-desktop-error.js b/ui/pages/desktop-error/render-desktop-error.js
index fcb8cd9b8..810a118e9 100644
--- a/ui/pages/desktop-error/render-desktop-error.js
+++ b/ui/pages/desktop-error/render-desktop-error.js
@@ -16,7 +16,7 @@ import Typography from '../../components/ui/typography';
 import Button from '../../components/ui/button';
 import Box from '../../components/ui/box';
 import { openCustomProtocol } from '../../../shared/lib/deep-linking';
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 
 export function renderDesktopError({
   type,
@@ -84,7 +84,7 @@ export function renderDesktopError({
               onClick();
               if (typeof trackEvent === 'function') {
                 trackEvent({
-                  category: EVENT.CATEGORIES.DESKTOP,
+                  category: MetaMetricsEventCategory.Desktop,
                   event: 'Desktop Button Clicked',
                   properties: {
                     button_action: action,
diff --git a/ui/pages/error/error.component.js b/ui/pages/error/error.component.js
index 888a64a07..04095cec4 100644
--- a/ui/pages/error/error.component.js
+++ b/ui/pages/error/error.component.js
@@ -4,9 +4,9 @@ import { getEnvironmentType } from '../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../shared/constants/app';
 import { SUPPORT_REQUEST_LINK } from '../../helpers/constants/common';
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
 } from '../../../shared/constants/metametrics';
 
 class ErrorPage extends PureComponent {
@@ -50,14 +50,16 @@ class ErrorPage extends PureComponent {
         onClick={() => {
           this.context.trackEvent(
             {
-              category: EVENT.CATEGORIES.ERROR,
-              event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+              category: MetaMetricsEventCategory.Error,
+              event: MetaMetricsEventName.SupportLinkClicked,
               properties: {
                 url: SUPPORT_REQUEST_LINK,
               },
             },
             {
-              contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+              contextPropsIntoEventProperties: [
+                MetaMetricsContextProp.PageTitle,
+              ],
             },
           );
         }}
diff --git a/ui/pages/home/beta/beta-home-footer.component.js b/ui/pages/home/beta/beta-home-footer.component.js
index 3456ebf42..d4077e402 100644
--- a/ui/pages/home/beta/beta-home-footer.component.js
+++ b/ui/pages/home/beta/beta-home-footer.component.js
@@ -3,9 +3,9 @@ import React, { useContext } from 'react';
 import { SUPPORT_REQUEST_LINK } from '../../../helpers/constants/common';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 
@@ -25,14 +25,16 @@ const BetaHomeFooter = () => {
         onClick={() => {
           trackEvent(
             {
-              category: EVENT.CATEGORIES.FOOTER,
-              event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+              category: MetaMetricsEventCategory.Footer,
+              event: MetaMetricsEventName.SupportLinkClicked,
               properties: {
                 url: SUPPORT_REQUEST_LINK,
               },
             },
             {
-              contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+              contextPropsIntoEventProperties: [
+                MetaMetricsContextProp.PageTitle,
+              ],
             },
           );
         }}
diff --git a/ui/pages/home/flask/flask-home-footer.component.js b/ui/pages/home/flask/flask-home-footer.component.js
index 0925d9f12..317b09578 100644
--- a/ui/pages/home/flask/flask-home-footer.component.js
+++ b/ui/pages/home/flask/flask-home-footer.component.js
@@ -3,9 +3,9 @@ import React, { useContext } from 'react';
 import { SUPPORT_REQUEST_LINK } from '../../../helpers/constants/common';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 
@@ -22,14 +22,16 @@ const FlaskHomeFooter = () => {
         onClick={() => {
           trackEvent(
             {
-              category: EVENT.CATEGORIES.FOOTER,
-              event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+              category: MetaMetricsEventCategory.Footer,
+              event: MetaMetricsEventName.SupportLinkClicked,
               properties: {
                 url: SUPPORT_REQUEST_LINK,
               },
             },
             {
-              contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+              contextPropsIntoEventProperties: [
+                MetaMetricsContextProp.PageTitle,
+              ],
             },
           );
         }}
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index cdc666317..5893fe0cd 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { Redirect, Route } from 'react-router-dom';
 ///: BEGIN:ONLY_INCLUDE_IN(main)
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
 } from '../../../shared/constants/metametrics';
 ///: END:ONLY_INCLUDE_IN
 import AssetList from '../../components/app/asset-list';
@@ -699,15 +699,15 @@ export default class Home extends PureComponent {
                     onClick={() => {
                       this.context.trackEvent(
                         {
-                          category: EVENT.CATEGORIES.HOME,
-                          event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+                          category: MetaMetricsEventCategory.Home,
+                          event: MetaMetricsEventName.SupportLinkClicked,
                           properties: {
                             url: SUPPORT_LINK,
                           },
                         },
                         {
                           contextPropsIntoEventProperties: [
-                            CONTEXT_PROPS.PAGE_TITLE,
+                            MetaMetricsContextProp.PageTitle,
                           ],
                         },
                       );
diff --git a/ui/pages/keychains/restore-vault.js b/ui/pages/keychains/restore-vault.js
index 708f4d824..9ffc11e4a 100644
--- a/ui/pages/keychains/restore-vault.js
+++ b/ui/pages/keychains/restore-vault.js
@@ -15,7 +15,7 @@ import {
   TextColor,
   TypographyVariant,
 } from '../../helpers/constants/design-system';
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 
 class RestoreVaultPage extends Component {
   static contextTypes = {
@@ -41,7 +41,7 @@ class RestoreVaultPage extends Component {
     leaveImportSeedScreenState();
     await createNewVaultAndRestore(password, seedPhrase);
     this.context.trackEvent({
-      category: EVENT.CATEGORIES.RETENTION,
+      category: MetaMetricsEventCategory.Retention,
       event: 'onboardingRestoredVault',
       properties: {
         action: 'userEntersSeedPhrase',
diff --git a/ui/pages/keychains/reveal-seed.js b/ui/pages/keychains/reveal-seed.js
index 82d4b90a5..54633840f 100644
--- a/ui/pages/keychains/reveal-seed.js
+++ b/ui/pages/keychains/reveal-seed.js
@@ -5,7 +5,11 @@ import qrCode from 'qrcode-generator';
 import { requestRevealSeedWords, showModal } from '../../store/actions';
 import ExportTextContainer from '../../components/ui/export-text-container';
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
-import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventKeyType,
+  MetaMetricsEventName,
+} from '../../../shared/constants/metametrics';
 import {
   TextVariant,
   SEVERITIES,
@@ -72,10 +76,10 @@ const RevealSeedPage = () => {
     dispatch(requestRevealSeedWords(password))
       .then((revealedSeedWords) => {
         trackEvent({
-          category: EVENT.CATEGORIES.KEYS,
-          event: EVENT_NAMES.KEY_EXPORT_REVEALED,
+          category: MetaMetricsEventCategory.Keys,
+          event: MetaMetricsEventName.KeyExportRevealed,
           properties: {
-            key_type: EVENT.KEY_TYPES.SRP,
+            key_type: MetaMetricsEventKeyType.Srp,
           },
         });
         setSeedWords(revealedSeedWords);
@@ -92,10 +96,10 @@ const RevealSeedPage = () => {
       })
       .catch((e) => {
         trackEvent({
-          category: EVENT.CATEGORIES.KEYS,
-          event: EVENT_NAMES.KEY_EXPORT_FAILED,
+          category: MetaMetricsEventCategory.Keys,
+          event: MetaMetricsEventName.KeyExportFailed,
           properties: {
-            key_type: EVENT.KEY_TYPES.SRP,
+            key_type: MetaMetricsEventKeyType.Srp,
             reason: e.message, // 'incorrect_password',
           },
         });
@@ -158,10 +162,10 @@ const RevealSeedPage = () => {
               text={seedWords}
               onClickCopy={() => {
                 trackEvent({
-                  category: EVENT.CATEGORIES.KEYS,
-                  event: EVENT_NAMES.KEY_EXPORT_COPIED,
+                  category: MetaMetricsEventCategory.Keys,
+                  event: MetaMetricsEventName.KeyExportCopied,
                   properties: {
-                    key_type: EVENT.KEY_TYPES.SRP,
+                    key_type: MetaMetricsEventKeyType.Srp,
                     copy_method: 'clipboard',
                   },
                 });
@@ -201,10 +205,10 @@ const RevealSeedPage = () => {
           type={BUTTON_TYPES.SECONDARY}
           onClick={() => {
             trackEvent({
-              category: EVENT.CATEGORIES.KEYS,
-              event: EVENT_NAMES.KEY_EXPORT_CANCELED,
+              category: MetaMetricsEventCategory.Keys,
+              event: MetaMetricsEventName.KeyExportCanceled,
               properties: {
-                key_type: EVENT.KEY_TYPES.SRP,
+                key_type: MetaMetricsEventKeyType.Srp,
               },
             });
             history.push(mostRecentOverviewPage);
@@ -217,10 +221,10 @@ const RevealSeedPage = () => {
           size={Size.LG}
           onClick={(event) => {
             trackEvent({
-              category: EVENT.CATEGORIES.KEYS,
-              event: EVENT_NAMES.KEY_EXPORT_REQUESTED,
+              category: MetaMetricsEventCategory.Keys,
+              event: MetaMetricsEventName.KeyExportRequested,
               properties: {
-                key_type: EVENT.KEY_TYPES.SRP,
+                key_type: MetaMetricsEventKeyType.Srp,
               },
             });
             handleSubmit(event);
diff --git a/ui/pages/onboarding-flow/create-password/create-password.js b/ui/pages/onboarding-flow/create-password/create-password.js
index 6fa0b5f66..daf223fcd 100644
--- a/ui/pages/onboarding-flow/create-password/create-password.js
+++ b/ui/pages/onboarding-flow/create-password/create-password.js
@@ -31,7 +31,10 @@ import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
 import { getFirstTimeFlowType, getCurrentKeyring } from '../../../selectors';
 import { FIRST_TIME_FLOW_TYPES } from '../../../helpers/constants/onboarding';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { Icon, ICON_NAMES } from '../../../components/component-library';
 
 export default function CreatePassword({
@@ -141,8 +144,8 @@ export default function CreatePassword({
     }
 
     trackEvent({
-      category: EVENT.CATEGORIES.ONBOARDING,
-      event: EVENT_NAMES.ONBOARDING_WALLET_CREATION_ATTEMPTED,
+      category: MetaMetricsEventCategory.Onboarding,
+      event: MetaMetricsEventName.OnboardingWalletCreationAttempted,
     });
 
     // If secretRecoveryPhrase is defined we are in import wallet flow
diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.js b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
index 0a8b16823..73fc31f0e 100644
--- a/ui/pages/onboarding-flow/creation-successful/creation-successful.js
+++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
@@ -18,7 +18,10 @@ import {
 } from '../../../helpers/constants/routes';
 import { isBeta } from '../../../helpers/utils/build-types';
 import { getFirstTimeFlowType } from '../../../selectors';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 
 export default function CreationSuccessful() {
@@ -101,8 +104,8 @@ export default function CreationSuccessful() {
           rounded
           onClick={() => {
             trackEvent({
-              category: EVENT.CATEGORIES.ONBOARDING,
-              event: EVENT_NAMES.ONBOARDING_WALLET_CREATION_COMPLETE,
+              category: MetaMetricsEventCategory.Onboarding,
+              event: MetaMetricsEventName.OnboardingWalletCreationComplete,
               properties: {
                 method: firstTimeFlowType,
               },
diff --git a/ui/pages/onboarding-flow/import-srp/import-srp.js b/ui/pages/onboarding-flow/import-srp/import-srp.js
index 63fc3af07..6abc7e5e3 100644
--- a/ui/pages/onboarding-flow/import-srp/import-srp.js
+++ b/ui/pages/onboarding-flow/import-srp/import-srp.js
@@ -20,7 +20,10 @@ import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
 import SrpInput from '../../../components/app/srp-input';
 import { getCurrentKeyring } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 
 export default function ImportSRP({ submitSecretRecoveryPhrase }) {
   const [secretRecoveryPhrase, setSecretRecoveryPhrase] = useState('');
@@ -78,8 +81,9 @@ export default function ImportSRP({ submitSecretRecoveryPhrase }) {
             onClick={() => {
               submitSecretRecoveryPhrase(secretRecoveryPhrase);
               trackEvent({
-                category: EVENT.CATEGORIES.ONBOARDING,
-                event: EVENT_NAMES.ONBOARDING_WALLET_SECURITY_PHRASE_CONFIRMED,
+                category: MetaMetricsEventCategory.Onboarding,
+                event:
+                  MetaMetricsEventName.OnboardingWalletSecurityPhraseConfirmed,
               });
               history.replace(ONBOARDING_CREATE_PASSWORD_ROUTE);
             }}
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
index 5cb133c22..c79851970 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -17,7 +17,11 @@ import {
   getFirstTimeFlowType,
 } from '../../../selectors';
 
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventAccountType,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
@@ -43,13 +47,13 @@ export default function OnboardingMetametrics() {
     try {
       trackEvent(
         {
-          category: EVENT.CATEGORIES.ONBOARDING,
-          event: EVENT_NAMES.WALLET_SETUP_STARTED,
+          category: MetaMetricsEventCategory.Onboarding,
+          event: MetaMetricsEventName.WalletSetupStarted,
           properties: {
             account_type:
               firstTimeFlowType === 'create'
-                ? EVENT.ACCOUNT_TYPES.DEFAULT
-                : EVENT.ACCOUNT_TYPES.IMPORTED,
+                ? MetaMetricsEventAccountType.Default
+                : MetaMetricsEventAccountType.Imported,
           },
         },
         {
diff --git a/ui/pages/onboarding-flow/onboarding-flow.js b/ui/pages/onboarding-flow/onboarding-flow.js
index 46a331172..4ce73f933 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.js
+++ b/ui/pages/onboarding-flow/onboarding-flow.js
@@ -30,7 +30,10 @@ import { getFirstTimeFlowTypeRoute } from '../../selectors';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import Button from '../../components/ui/button';
 import { useI18nContext } from '../../hooks/useI18nContext';
-import { EVENT_NAMES, EVENT } from '../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../shared/constants/metametrics';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 import ExperimentalArea from '../../components/app/flask/experimental-area';
 ///: END:ONLY_INCLUDE_IN
@@ -191,11 +194,11 @@ export default function OnboardingFlow() {
           href={TWITTER_URL}
           onClick={() => {
             trackEvent({
-              category: EVENT.CATEGORIES.ONBOARDING,
-              event: EVENT_NAMES.ONBOARDING_TWITTER_CLICK,
+              category: MetaMetricsEventCategory.Onboarding,
+              event: MetaMetricsEventName.OnboardingTwitterClick,
               properties: {
                 text: t('followUsOnTwitter'),
-                location: EVENT_NAMES.ONBOARDING_WALLET_CREATION_COMPLETE,
+                location: MetaMetricsEventName.OnboardingWalletCreationComplete,
                 url: TWITTER_URL,
               },
             });
diff --git a/ui/pages/onboarding-flow/pin-extension/pin-extension.js b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
index 2797224a9..cc058967e 100644
--- a/ui/pages/onboarding-flow/pin-extension/pin-extension.js
+++ b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
@@ -12,7 +12,10 @@ import {
 } from '../../../helpers/constants/design-system';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { setCompletedOnboarding } from '../../../store/actions';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { FIRST_TIME_FLOW_TYPES } from '../../../helpers/constants/onboarding';
 import { getFirstTimeFlowType } from '../../../selectors';
@@ -32,8 +35,8 @@ export default function OnboardingPinExtension() {
     } else {
       await dispatch(setCompletedOnboarding());
       trackEvent({
-        category: EVENT.CATEGORIES.ONBOARDING,
-        event: EVENT_NAMES.ONBOARDING_WALLET_SETUP_COMPLETE,
+        category: MetaMetricsEventCategory.Onboarding,
+        event: MetaMetricsEventName.OnboardingWalletSetupComplete,
         properties: {
           wallet_setup_type:
             firstTimeFlowType === FIRST_TIME_FLOW_TYPES.IMPORT
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index 3c23c51b8..4f28dc791 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -34,7 +34,10 @@ import {
   PRIVACY_POLICY_LINK,
 } from '../../../../shared/lib/ui-utils';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 
 import { Setting } from './setting';
 
@@ -77,8 +80,8 @@ export default function PrivacySettings() {
     }
 
     trackEvent({
-      category: EVENT.CATEGORIES.ONBOARDING,
-      event: EVENT_NAMES.ONBOARDING_WALLET_ADVANCED_SETTINGS,
+      category: MetaMetricsEventCategory.Onboarding,
+      event: MetaMetricsEventName.OnboardingWalletAdvancedSettings,
       properties: {
         show_incoming_tx: showIncomingTransactions,
         use_phising_detection: usePhishingDetection,
diff --git a/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js b/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
index 60a35732d..c933bd561 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
+++ b/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
@@ -20,7 +20,10 @@ import { ONBOARDING_COMPLETION_ROUTE } from '../../../helpers/constants/routes';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { setSeedPhraseBackedUp } from '../../../store/actions';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import RecoveryPhraseChips from './recovery-phrase-chips';
 
 export default function ConfirmRecoveryPhrase({ secretRecoveryPhrase = '' }) {
@@ -105,8 +108,9 @@ export default function ConfirmRecoveryPhrase({ secretRecoveryPhrase = '' }) {
           onClick={async () => {
             await dispatch(setSeedPhraseBackedUp(true));
             trackEvent({
-              category: EVENT.CATEGORIES.ONBOARDING,
-              event: EVENT_NAMES.ONBOARDING_WALLET_SECURITY_PHRASE_CONFIRMED,
+              category: MetaMetricsEventCategory.Onboarding,
+              event:
+                MetaMetricsEventName.OnboardingWalletSecurityPhraseConfirmed,
             });
             history.push(ONBOARDING_COMPLETION_ROUTE);
           }}
diff --git a/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js b/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
index 5e39d46ca..b7fa4f789 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
+++ b/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
@@ -18,7 +18,10 @@ import {
   ThreeStepProgressBar,
   threeStepStages,
 } from '../../../components/app/step-progress-bar';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { Icon, ICON_NAMES } from '../../../components/component-library';
 import RecoveryPhraseChips from './recovery-phrase-chips';
@@ -136,9 +139,9 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
               className="recovery-phrase__footer--button"
               onClick={() => {
                 trackEvent({
-                  category: EVENT.CATEGORIES.ONBOARDING,
+                  category: MetaMetricsEventCategory.Onboarding,
                   event:
-                    EVENT_NAMES.ONBOARDING_WALLET_SECURITY_PHRASE_WRITTEN_DOWN,
+                    MetaMetricsEventName.OnboardingWalletSecurityPhraseWrittenDown,
                 });
                 history.push(
                   `${ONBOARDING_CONFIRM_SRP_ROUTE}${isFromReminderParam}`,
@@ -155,8 +158,9 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
             className="recovery-phrase__footer--button"
             onClick={() => {
               trackEvent({
-                category: EVENT.CATEGORIES.ONBOARDING,
-                event: EVENT_NAMES.ONBOARDING_WALLET_SECURITY_PHRASE_REVEALED,
+                category: MetaMetricsEventCategory.Onboarding,
+                event:
+                  MetaMetricsEventName.OnboardingWalletSecurityPhraseRevealed,
               });
               setPhraseRevealed(true);
             }}
diff --git a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
index 475bcf7c2..a5891c63a 100644
--- a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
+++ b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
@@ -19,7 +19,10 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { ONBOARDING_REVIEW_SRP_ROUTE } from '../../../helpers/constants/routes';
 import { getCurrentLocale } from '../../../ducks/locale/locale';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import SkipSRPBackup from './skip-srp-backup-popover';
 
 export default function SecureYourWallet() {
@@ -38,16 +41,16 @@ export default function SecureYourWallet() {
 
   const handleClickRecommended = () => {
     trackEvent({
-      category: EVENT.CATEGORIES.ONBOARDING,
-      event: EVENT_NAMES.ONBOARDING_WALLET_SECURITY_STARTED,
+      category: MetaMetricsEventCategory.Onboarding,
+      event: MetaMetricsEventName.OnboardingWalletSecurityStarted,
     });
     history.push(`${ONBOARDING_REVIEW_SRP_ROUTE}${isFromReminderParam}`);
   };
 
   const handleClickNotRecommended = () => {
     trackEvent({
-      category: EVENT.CATEGORIES.ONBOARDING,
-      event: EVENT_NAMES.ONBOARDING_WALLET_SECURITY_SKIP_INITIATED,
+      category: MetaMetricsEventCategory.Onboarding,
+      event: MetaMetricsEventName.OnboardingWalletSecuritySkipInitiated,
     });
     setShowSkipSRPBackupPopover(true);
   };
@@ -105,8 +108,8 @@ export default function SecureYourWallet() {
           className="secure-your-wallet__video"
           onPlay={() => {
             trackEvent({
-              category: EVENT.CATEGORIES.ONBOARDING,
-              event: EVENT_NAMES.ONBOARDING_WALLET_VIDEO_PLAY,
+              category: MetaMetricsEventCategory.Onboarding,
+              event: MetaMetricsEventName.OnboardingWalletVideoPlay,
             });
           }}
           controls
diff --git a/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js b/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js
index bd64f9347..982094906 100644
--- a/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js
+++ b/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js
@@ -18,7 +18,10 @@ import {
 import { setSeedPhraseBackedUp } from '../../../store/actions';
 import Checkbox from '../../../components/ui/check-box';
 import { ONBOARDING_COMPLETION_ROUTE } from '../../../helpers/constants/routes';
-import { EVENT_NAMES, EVENT } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
   Icon,
@@ -45,8 +48,9 @@ export default function SkipSRPBackup({ handleClose }) {
           <Button
             onClick={() => {
               trackEvent({
-                category: EVENT.CATEGORIES.ONBOARDING,
-                event: EVENT_NAMES.ONBOARDING_WALLET_SECURITY_SKIP_CANCELED,
+                category: MetaMetricsEventCategory.Onboarding,
+                event:
+                  MetaMetricsEventName.OnboardingWalletSecuritySkipCanceled,
               });
               handleClose();
             }}
@@ -63,8 +67,9 @@ export default function SkipSRPBackup({ handleClose }) {
             onClick={async () => {
               await dispatch(setSeedPhraseBackedUp(false));
               trackEvent({
-                category: EVENT.CATEGORIES.ONBOARDING,
-                event: EVENT_NAMES.ONBOARDING_WALLET_SECURITY_SKIP_CONFIRMED,
+                category: MetaMetricsEventCategory.Onboarding,
+                event:
+                  MetaMetricsEventName.OnboardingWalletSecuritySkipConfirmed,
               });
               history.push(ONBOARDING_COMPLETION_ROUTE);
             }}
diff --git a/ui/pages/onboarding-flow/welcome/welcome.js b/ui/pages/onboarding-flow/welcome/welcome.js
index 66de54ddd..042282dc2 100644
--- a/ui/pages/onboarding-flow/welcome/welcome.js
+++ b/ui/pages/onboarding-flow/welcome/welcome.js
@@ -13,7 +13,10 @@ import {
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { setFirstTimeFlowType } from '../../../store/actions';
 import {
   ONBOARDING_METAMETRICS,
@@ -47,8 +50,8 @@ export default function OnboardingWelcome() {
   const onCreateClick = () => {
     dispatch(setFirstTimeFlowType('create'));
     trackEvent({
-      category: EVENT.CATEGORIES.ONBOARDING,
-      event: EVENT_NAMES.ONBOARDING_WALLET_CREATION_STARTED,
+      category: MetaMetricsEventCategory.Onboarding,
+      event: MetaMetricsEventName.OnboardingWalletCreationStarted,
       properties: {
         account_type: 'metamask',
       },
@@ -59,8 +62,8 @@ export default function OnboardingWelcome() {
   const onImportClick = () => {
     dispatch(setFirstTimeFlowType('import'));
     trackEvent({
-      category: EVENT.CATEGORIES.ONBOARDING,
-      event: EVENT_NAMES.ONBOARDING_WALLET_IMPORT_STARTED,
+      category: MetaMetricsEventCategory.Onboarding,
+      event: MetaMetricsEventName.OnboardingWalletImportStarted,
       properties: {
         account_type: 'imported',
       },
@@ -69,8 +72,8 @@ export default function OnboardingWelcome() {
   };
 
   trackEvent({
-    category: EVENT.CATEGORIES.ONBOARDING,
-    event: EVENT_NAMES.ONBOARDING_WELCOME,
+    category: MetaMetricsEventCategory.Onboarding,
+    event: MetaMetricsEventName.OnboardingWelcome,
     properties: {
       message_title: t('welcomeToMetaMask'),
       app_version: global?.platform?.getVersion(),
diff --git a/ui/pages/send/gas-display/gas-display.js b/ui/pages/send/gas-display/gas-display.js
index ab078b368..78e1c2882 100644
--- a/ui/pages/send/gas-display/gas-display.js
+++ b/ui/pages/send/gas-display/gas-display.js
@@ -45,7 +45,10 @@ import {
   hexWEIToDecETH,
   hexWEIToDecGWEI,
 } from '../../../../shared/modules/conversion.utils';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import useRamps from '../../../hooks/experiences/useRamps';
 
@@ -342,8 +345,8 @@ export default function GasDisplay({ gasError }) {
                         onClick={() => {
                           openBuyCryptoInPdapp();
                           trackEvent({
-                            event: EVENT_NAMES.NAV_BUY_BUTTON_CLICKED,
-                            category: EVENT.CATEGORIES.NAVIGATION,
+                            event: MetaMetricsEventName.NavBuyButtonClicked,
+                            category: MetaMetricsEventCategory.Navigation,
                             properties: {
                               location: 'Gas Warning Insufficient Funds',
                               text: 'Buy',
diff --git a/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.js b/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.js
index 061d9b06e..1c7b83367 100644
--- a/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.js
+++ b/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.js
@@ -8,7 +8,7 @@ import {
 } from '../../../../../ducks/send';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../../../contexts/metametrics';
-import { EVENT } from '../../../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../../../shared/constants/metametrics';
 
 export default function AmountMaxButton() {
   const isDraftTransactionInvalid = useSelector(isSendFormInvalid);
@@ -20,7 +20,7 @@ export default function AmountMaxButton() {
   const onMaxClick = () => {
     trackEvent({
       event: 'Clicked "Amount Max"',
-      category: EVENT.CATEGORIES.TRANSACTIONS,
+      category: MetaMetricsEventCategory.Transactions,
       properties: {
         action: 'Edit Screen',
         legacy_event: true,
diff --git a/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js b/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js
index cb5aaf587..b39ea987b 100644
--- a/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js
+++ b/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js
@@ -7,7 +7,7 @@ import TokenListDisplay from '../../../../components/app/token-list-display';
 import UserPreferencedCurrencyDisplay from '../../../../components/app/user-preferenced-currency-display';
 import { PRIMARY } from '../../../../helpers/constants/common';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
-import { EVENT } from '../../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../../shared/constants/metametrics';
 import {
   AssetType,
   TokenStandard,
@@ -97,7 +97,7 @@ export default class SendAssetRow extends Component {
       },
       () => {
         this.context.trackEvent({
-          category: EVENT.CATEGORIES.TRANSACTIONS,
+          category: MetaMetricsEventCategory.Transactions,
           event: 'User clicks "Assets" dropdown',
           properties: {
             action: 'Send Screen',
diff --git a/ui/pages/send/send-footer/send-footer.component.js b/ui/pages/send/send-footer/send-footer.component.js
index c5a8887ee..f16ad7e09 100644
--- a/ui/pages/send/send-footer/send-footer.component.js
+++ b/ui/pages/send/send-footer/send-footer.component.js
@@ -6,7 +6,7 @@ import {
   CONFIRM_TRANSACTION_ROUTE,
   DEFAULT_ROUTE,
 } from '../../../helpers/constants/routes';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { SEND_STAGES } from '../../../ducks/send';
 
 export default class SendFooter extends Component {
@@ -56,7 +56,7 @@ export default class SendFooter extends Component {
 
     Promise.resolve(promise).then(() => {
       trackEvent({
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         event: 'Complete',
         properties: {
           action: 'Edit Screen',
@@ -78,7 +78,7 @@ export default class SendFooter extends Component {
       const errorMessage = sendErrors[errorField];
 
       trackEvent({
-        category: EVENT.CATEGORIES.TRANSACTIONS,
+        category: MetaMetricsEventCategory.Transactions,
         event: 'Error',
         properties: {
           action: 'Edit Screen',
diff --git a/ui/pages/send/send.js b/ui/pages/send/send.js
index 6307340ff..251fb3d1b 100644
--- a/ui/pages/send/send.js
+++ b/ui/pages/send/send.js
@@ -19,7 +19,7 @@ import { isCustomPriceExcessive } from '../../selectors';
 import { getSendHexDataFeatureFlagState } from '../../ducks/metamask/metamask';
 import { showQrScanner } from '../../store/actions';
 import { MetaMetricsContext } from '../../contexts/metametrics';
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import { AssetType } from '../../../shared/constants/transaction';
 import SendHeader from './send-header';
 import AddRecipient from './send-content/add-recipient';
@@ -137,7 +137,7 @@ export default function SendTransactionScreen() {
         scanQrCode={() => {
           trackEvent({
             event: 'Used QR scanner',
-            category: EVENT.CATEGORIES.TRANSACTIONS,
+            category: MetaMetricsEventCategory.Transactions,
             properties: {
               action: 'Edit Screen',
               legacy_event: true,
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index 4c4dd79e0..f4bc1c870 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -19,7 +19,10 @@ import {
   LedgerTransportTypes,
   LEDGER_USB_VENDOR_ID,
 } from '../../../../shared/constants/hardware-wallets';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import { exportAsFile } from '../../../helpers/utils/export-utils';
 import ActionableMessage from '../../../components/ui/actionable-message';
 import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
@@ -245,8 +248,8 @@ export default class AdvancedTab extends PureComponent {
               onClick={(event) => {
                 event.preventDefault();
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.SETTINGS,
-                  event: EVENT_NAMES.ACCOUNT_RESET,
+                  category: MetaMetricsEventCategory.Settings,
+                  event: MetaMetricsEventName.AccountReset,
                   properties: {},
                 });
                 showResetAccountConfirmationModal();
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js
index 5039af938..52061def7 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.component.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js
@@ -5,7 +5,7 @@ import {
   getNumberOfSettingsInSection,
   handleSettingsRefs,
 } from '../../../helpers/utils/settings-search';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import Typography from '../../../components/ui/typography/typography';
 import { Text } from '../../../components/component-library';
 import {
@@ -77,7 +77,7 @@ export default class ExperimentalTab extends PureComponent {
                 value={openSeaEnabled}
                 onToggle={(value) => {
                   this.context.trackEvent({
-                    category: EVENT.CATEGORIES.SETTINGS,
+                    category: MetaMetricsEventCategory.Settings,
                     event: 'Enabled/Disable OpenSea',
                     properties: {
                       action: 'Enabled/Disable OpenSea',
@@ -119,7 +119,7 @@ export default class ExperimentalTab extends PureComponent {
                 value={useNftDetection}
                 onToggle={(value) => {
                   this.context.trackEvent({
-                    category: EVENT.CATEGORIES.SETTINGS,
+                    category: MetaMetricsEventCategory.Settings,
                     event: 'NFT Detected',
                     properties: {
                       action: 'NFT Detected',
@@ -193,7 +193,7 @@ export default class ExperimentalTab extends PureComponent {
                   value={transactionSecurityCheckEnabled}
                   onToggle={(value) => {
                     this.context.trackEvent({
-                      category: EVENT.CATEGORIES.SETTINGS,
+                      category: MetaMetricsEventCategory.Settings,
                       event: 'Enabled/Disable TransactionSecurityCheck',
                       properties: {
                         action: 'Enabled/Disable TransactionSecurityCheck',
diff --git a/ui/pages/settings/info-tab/info-tab.component.js b/ui/pages/settings/info-tab/info-tab.component.js
index 8fef74d12..33c006d1e 100644
--- a/ui/pages/settings/info-tab/info-tab.component.js
+++ b/ui/pages/settings/info-tab/info-tab.component.js
@@ -16,9 +16,9 @@ import {
   handleSettingsRefs,
 } from '../../../helpers/utils/settings-search';
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import { SUPPORT_LINK } from '../../../../shared/lib/ui-utils';
 
@@ -127,14 +127,16 @@ export default class InfoTab extends PureComponent {
             onClick={() => {
               this.context.trackEvent(
                 {
-                  category: EVENT.CATEGORIES.SETTINGS,
-                  event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+                  category: MetaMetricsEventCategory.Settings,
+                  event: MetaMetricsEventName.SupportLinkClicked,
                   properties: {
                     url: SUPPORT_LINK,
                   },
                 },
                 {
-                  contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+                  contextPropsIntoEventProperties: [
+                    MetaMetricsContextProp.PageTitle,
+                  ],
                 },
               );
             }}
@@ -163,14 +165,16 @@ export default class InfoTab extends PureComponent {
             onClick={() => {
               this.context.trackEvent(
                 {
-                  category: EVENT.CATEGORIES.SETTINGS,
-                  event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+                  category: MetaMetricsEventCategory.Settings,
+                  event: MetaMetricsEventName.SupportLinkClicked,
                   properties: {
                     url: SUPPORT_REQUEST_LINK,
                   },
                 },
                 {
-                  contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+                  contextPropsIntoEventProperties: [
+                    MetaMetricsContextProp.PageTitle,
+                  ],
                 },
               );
             }}
diff --git a/ui/pages/settings/networks-tab/networks-form/networks-form.js b/ui/pages/settings/networks-tab/networks-form/networks-form.js
index ee79b71c9..5839bbe93 100644
--- a/ui/pages/settings/networks-tab/networks-form/networks-form.js
+++ b/ui/pages/settings/networks-tab/networks-form/networks-form.js
@@ -23,7 +23,7 @@ import {
 } from '../../../../store/actions';
 import fetchWithCache from '../../../../../shared/lib/fetch-with-cache';
 import { usePrevious } from '../../../../hooks/usePrevious';
-import { EVENT } from '../../../../../shared/constants/metametrics';
+import { MetaMetricsNetworkEventSource } from '../../../../../shared/constants/metametrics';
 import {
   infuraProjectId,
   FEATURED_RPCS,
@@ -510,7 +510,7 @@ const NetworksForm = ({
               },
             },
             {
-              source: EVENT.SOURCE.NETWORK.CUSTOM_NETWORK_FORM,
+              source: MetaMetricsNetworkEventSource.CustomNetworkForm,
             },
           ),
         );
@@ -530,7 +530,7 @@ const NetworksForm = ({
             },
             {
               setActive: true,
-              source: EVENT.SOURCE.NETWORK.CUSTOM_NETWORK_FORM,
+              source: MetaMetricsNetworkEventSource.CustomNetworkForm,
             },
           ),
         );
diff --git a/ui/pages/settings/security-tab/security-tab.component.js b/ui/pages/settings/security-tab/security-tab.component.js
index 7c4f24f26..601f8cb5a 100644
--- a/ui/pages/settings/security-tab/security-tab.component.js
+++ b/ui/pages/settings/security-tab/security-tab.component.js
@@ -12,7 +12,11 @@ import {
   getNumberOfSettingsInSection,
   handleSettingsRefs,
 } from '../../../helpers/utils/settings-search';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventKeyType,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import {
   COINGECKO_LINK,
   CRYPTOCOMPARE_LINK,
@@ -82,7 +86,7 @@ export default class SecurityTab extends PureComponent {
 
   toggleSetting(value, eventName, eventAction, toggleMethod) {
     this.context.trackEvent({
-      category: EVENT.CATEGORIES.SETTINGS,
+      category: MetaMetricsEventCategory.Settings,
       event: eventName,
       properties: {
         action: eventAction,
@@ -110,10 +114,10 @@ export default class SecurityTab extends PureComponent {
               onClick={(event) => {
                 event.preventDefault();
                 this.context.trackEvent({
-                  category: EVENT.CATEGORIES.SETTINGS,
-                  event: EVENT_NAMES.KEY_EXPORT_SELECTED,
+                  category: MetaMetricsEventCategory.Settings,
+                  event: MetaMetricsEventName.KeyExportSelected,
                   properties: {
-                    key_type: EVENT.KEY_TYPES.SRP,
+                    key_type: MetaMetricsEventKeyType.Srp,
                     location: 'Settings',
                   },
                 });
@@ -376,8 +380,8 @@ export default class SecurityTab extends PureComponent {
               onToggle={(value) => {
                 this.toggleSetting(
                   value,
-                  EVENT_NAMES.KEY_AUTO_DETECT_TOKENS,
-                  EVENT_NAMES.KEY_AUTO_DETECT_TOKENS,
+                  MetaMetricsEventName.KeyAutoDetectTokens,
+                  MetaMetricsEventName.KeyAutoDetectTokens,
                   setUseTokenDetection,
                 );
               }}
@@ -410,8 +414,8 @@ export default class SecurityTab extends PureComponent {
               onToggle={(value) => {
                 this.toggleSetting(
                   value,
-                  EVENT_NAMES.KEY_BATCH_ACCOUNT_BALANCE_REQUESTS,
-                  EVENT_NAMES.KEY_BATCH_ACCOUNT_BALANCE_REQUESTS,
+                  MetaMetricsEventName.KeyBatchAccountBalanceRequests,
+                  MetaMetricsEventName.KeyBatchAccountBalanceRequests,
                   setUseMultiAccountBalanceChecker,
                 );
               }}
diff --git a/ui/pages/settings/settings-tab/settings-tab.component.js b/ui/pages/settings/settings-tab/settings-tab.component.js
index 4a49fe288..dc0a5a428 100644
--- a/ui/pages/settings/settings-tab/settings-tab.component.js
+++ b/ui/pages/settings/settings-tab/settings-tab.component.js
@@ -12,7 +12,7 @@ import locales from '../../../../app/_locales/index.json';
 import Jazzicon from '../../../components/ui/jazzicon';
 import BlockieIdenticon from '../../../components/ui/identicon/blockieIdenticon';
 import Typography from '../../../components/ui/typography';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 
 import {
   getNumberOfSettingsInSection,
@@ -356,7 +356,7 @@ export default class SettingsTab extends PureComponent {
 
     const onChange = (newTheme) => {
       this.context.trackEvent({
-        category: EVENT.CATEGORIES.SETTINGS,
+        category: MetaMetricsEventCategory.Settings,
         event: 'Theme Changed',
         properties: {
           theme_selected: newTheme,
diff --git a/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js b/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js
index f0f44f0bf..4ba914891 100644
--- a/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js
+++ b/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js
@@ -33,7 +33,7 @@ import {
 } from '../../../helpers/constants/design-system';
 import SwapsFooter from '../swaps-footer';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import SwapStepIcon from './swap-step-icon';
 
 export default function AwaitingSignatures() {
@@ -58,7 +58,7 @@ export default function AwaitingSignatures() {
   useEffect(() => {
     trackEvent({
       event: 'Awaiting Signature(s) on a HW wallet',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         needs_two_confirmations: needsTwoConfirmations,
         token_from: sourceTokenInfo?.symbol,
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
index b3edc8462..29a91619b 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
@@ -8,9 +8,9 @@ import { getBlockExplorerLink } from '@metamask/etherscan-link';
 import { I18nContext } from '../../../contexts/i18n';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 
 import {
@@ -168,14 +168,16 @@ export default function AwaitingSwap({
         onClick={() => {
           trackEvent(
             {
-              category: EVENT.CATEGORIES.SWAPS,
-              event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+              category: MetaMetricsEventCategory.Swaps,
+              event: MetaMetricsEventName.SupportLinkClicked,
               properties: {
                 url: SUPPORT_LINK,
               },
             },
             {
-              contextPropsIntoEventProperties: [CONTEXT_PROPS.PAGE_TITLE],
+              contextPropsIntoEventProperties: [
+                MetaMetricsContextProp.PageTitle,
+              ],
             },
           );
         }}
@@ -201,7 +203,7 @@ export default function AwaitingSwap({
       setTrackedQuotesExpiredEvent(true);
       trackEvent({
         event: 'Quotes Timed Out',
-        category: EVENT.CATEGORIES.SWAPS,
+        category: MetaMetricsEventCategory.Swaps,
         sensitiveProperties,
       });
     }
diff --git a/ui/pages/swaps/build-quote/build-quote.js b/ui/pages/swaps/build-quote/build-quote.js
index f68683e09..6e0bc81b5 100644
--- a/ui/pages/swaps/build-quote/build-quote.js
+++ b/ui/pages/swaps/build-quote/build-quote.js
@@ -82,7 +82,11 @@ import {
   isSwapsDefaultTokenAddress,
   isSwapsDefaultTokenSymbol,
 } from '../../../../shared/modules/swaps.utils';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventLinkType,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 import {
   SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP,
   SWAPS_CHAINID_DEFAULT_TOKEN_MAP,
@@ -447,7 +451,7 @@ export default function BuildQuote({
   const trackBuildQuotePageLoadedEvent = useCallback(() => {
     trackEvent({
       event: 'Build Quote Page Loaded',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         is_hardware_wallet: hardwareWalletUsed,
         hardware_wallet_type: hardwareWalletType,
@@ -486,10 +490,10 @@ export default function BuildQuote({
         onClick={() => {
           /* istanbul ignore next */
           trackEvent({
-            event: EVENT_NAMES.EXTERNAL_LINK_CLICKED,
-            category: EVENT.CATEGORIES.SWAPS,
+            event: MetaMetricsEventName.ExternalLinkClicked,
+            category: MetaMetricsEventCategory.Swaps,
             properties: {
-              link_type: EVENT.EXTERNAL_LINK_TYPES.TOKEN_TRACKER,
+              link_type: MetaMetricsEventLinkType.TokenTracker,
               location: 'Swaps Confirmation',
               url_domain: getURLHostName(blockExplorerTokenLink),
             },
@@ -819,7 +823,7 @@ export default function BuildQuote({
                         /* istanbul ignore next */
                         trackEvent({
                           event: 'Clicked Block Explorer Link',
-                          category: EVENT.CATEGORIES.SWAPS,
+                          category: MetaMetricsEventCategory.Swaps,
                           properties: {
                             link_type: 'Token Tracker',
                             action: 'Swaps Confirmation',
diff --git a/ui/pages/swaps/create-new-swap/create-new-swap.js b/ui/pages/swaps/create-new-swap/create-new-swap.js
index 273908549..3f19b6863 100644
--- a/ui/pages/swaps/create-new-swap/create-new-swap.js
+++ b/ui/pages/swaps/create-new-swap/create-new-swap.js
@@ -7,7 +7,7 @@ import isEqual from 'lodash/isEqual';
 import Box from '../../../components/ui/box';
 import { I18nContext } from '../../../contexts/i18n';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import {
   navigateBackToBuildQuote,
   setSwapsFromToken,
@@ -28,7 +28,7 @@ export default function CreateNewSwap({ sensitiveTrackingProperties }) {
         onClick={async () => {
           trackEvent({
             event: 'Make Another Swap',
-            category: EVENT.CATEGORIES.SWAPS,
+            category: MetaMetricsEventCategory.Swaps,
             sensitiveProperties: sensitiveTrackingProperties,
           });
           history.push(DEFAULT_ROUTE); // It cleans up Swaps state.
diff --git a/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js b/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
index 17dd98528..955899c2b 100644
--- a/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
+++ b/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
@@ -29,7 +29,7 @@ import {
   getCurrentSmartTransactionsEnabled,
 } from '../../../ducks/swaps/swaps';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 
 export default function DropdownSearchList({
   searchListClassName,
@@ -95,7 +95,7 @@ export default function DropdownSearchList({
   const onImportTokenClick = () => {
     trackEvent({
       event: 'Token Imported',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         symbol: tokenForImport?.symbol,
         address: tokenForImport?.address,
@@ -244,7 +244,7 @@ export default function DropdownSearchList({
                             onClick={() => {
                               trackEvent({
                                 event: 'Clicked Block Explorer Link',
-                                category: EVENT.CATEGORIES.SWAPS,
+                                category: MetaMetricsEventCategory.Swaps,
                                 properties: {
                                   link_type: 'Token Tracker',
                                   action: 'Verify Contract Address',
diff --git a/ui/pages/swaps/fee-card/fee-card.js b/ui/pages/swaps/fee-card/fee-card.js
index 474516b65..f65c1c164 100644
--- a/ui/pages/swaps/fee-card/fee-card.js
+++ b/ui/pages/swaps/fee-card/fee-card.js
@@ -13,7 +13,7 @@ import {
   FONT_WEIGHT,
 } from '../../../helpers/constants/design-system';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { getUseCurrencyRateCheck } from '../../../selectors';
 
 const GAS_FEES_LEARN_MORE_URL =
@@ -95,7 +95,7 @@ export default function FeeCard({
                               /* istanbul ignore next */
                               trackEvent({
                                 event: 'Clicked "Gas Fees: Learn More" Link',
-                                category: EVENT.CATEGORIES.SWAPS,
+                                category: MetaMetricsEventCategory.Swaps,
                               });
                               global.platform.openTab({
                                 url: GAS_FEES_LEARN_MORE_URL,
diff --git a/ui/pages/swaps/index.js b/ui/pages/swaps/index.js
index df7b3cc7d..0781732fa 100644
--- a/ui/pages/swaps/index.js
+++ b/ui/pages/swaps/index.js
@@ -80,7 +80,7 @@ import {
 
 import { useGasFeeEstimates } from '../../hooks/useGasFeeEstimates';
 import FeatureToggledRoute from '../../helpers/higher-order-components/feature-toggled-route';
-import { EVENT } from '../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../shared/constants/metametrics';
 import { TransactionStatus } from '../../../shared/constants/transaction';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import { getSwapsTokensReceivedFromTxMeta } from '../../../shared/lib/transactions-controller-utils';
@@ -252,7 +252,7 @@ export default function Swap() {
   const trackExitedSwapsEvent = () => {
     trackEvent({
       event: 'Exited Swaps',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         token_from: fetchParams?.sourceTokenInfo?.symbol,
         token_from_amount: fetchParams?.value,
@@ -313,7 +313,7 @@ export default function Swap() {
   const trackErrorStxEvent = useCallback(() => {
     trackEvent({
       event: 'Error Smart Transactions',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         token_from: fetchParams?.sourceTokenInfo?.symbol,
         token_from_amount: fetchParams?.value,
diff --git a/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js b/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js
index ca0e53a65..ee964e8aa 100644
--- a/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js
+++ b/ui/pages/swaps/loading-swaps-quotes/loading-swaps-quotes.js
@@ -20,7 +20,7 @@ import {
 import { I18nContext } from '../../../contexts/i18n';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import Mascot from '../../../components/ui/mascot';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import SwapsFooter from '../swaps-footer';
 import BackgroundAnimation from './background-animation';
 
@@ -48,7 +48,7 @@ export default function LoadingSwapsQuotes({
   );
   const quotesRequestCancelledEventConfig = {
     event: 'Quotes Request Cancelled',
-    category: EVENT.CATEGORIES.SWAPS,
+    category: MetaMetricsEventCategory.Swaps,
     sensitiveProperties: {
       token_from: fetchParams?.sourceTokenInfo?.symbol,
       token_from_amount: fetchParams?.value,
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 385494c49..074e1f6af 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
@@ -12,7 +12,7 @@ import {
   getRpcPrefsForCurrentProvider,
   getUseCurrencyRateCheck,
 } from '../../../../selectors';
-import { EVENT } from '../../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../../shared/constants/metametrics';
 import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../../shared/constants/swaps';
 import { getURLHostName } from '../../../../helpers/utils/util';
 import { MetaMetricsContext } from '../../../../contexts/metametrics';
@@ -155,7 +155,7 @@ export default function ItemList({
                     /* istanbul ignore next */
                     trackEvent({
                       event: 'Clicked Block Explorer Link',
-                      category: EVENT.CATEGORIES.SWAPS,
+                      category: MetaMetricsEventCategory.Swaps,
                       properties: {
                         link_type: 'Token Tracker',
                         action: 'Verify Contract Address',
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 e082a69ba..3b5851543 100644
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
@@ -48,7 +48,7 @@ import {
   stopPollingForQuotes,
   setBackgroundSwapRouteState,
 } from '../../../store/actions';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { SmartTransactionStatus } from '../../../../shared/constants/transaction';
 
 import SwapsFooter from '../swaps-footer';
@@ -165,7 +165,7 @@ export default function SmartTransactionStatusPage() {
   useEffect(() => {
     trackEvent({
       event: 'STX Status Page Loaded',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties,
     });
     // eslint-disable-next-line
@@ -299,7 +299,7 @@ export default function SmartTransactionStatusPage() {
             setCancelSwapLinkClicked(true); // We want to hide it after a user clicks on it.
             trackEvent({
               event: 'Cancel STX',
-              category: EVENT.CATEGORIES.SWAPS,
+              category: MetaMetricsEventCategory.Swaps,
               sensitiveProperties,
             });
             dispatch(cancelSwapsSmartTransaction(latestSmartTransactionUuid));
diff --git a/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js b/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js
index 534e3f4a4..68fd42260 100644
--- a/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js
+++ b/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js
@@ -5,7 +5,11 @@ import Box from '../../../components/ui/box';
 import { I18nContext } from '../../../contexts/i18n';
 import { getURLHostName } from '../../../helpers/utils/util';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventLinkType,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 
 export default function ViewOnBlockExplorer({
   blockExplorerUrl,
@@ -20,11 +24,11 @@ export default function ViewOnBlockExplorer({
       <button
         onClick={() => {
           trackEvent({
-            event: EVENT_NAMES.EXTERNAL_LINK_CLICKED,
-            category: EVENT.CATEGORIES.SWAPS,
+            event: MetaMetricsEventName.ExternalLinkClicked,
+            category: MetaMetricsEventCategory.Swaps,
             sensitiveProperties: sensitiveTrackingProperties,
             properties: {
-              link_type: EVENT.EXTERNAL_LINK_TYPES.TRANSACTION_BLOCK_EXPLORER,
+              link_type: MetaMetricsEventLinkType.TransactionBlockExplorer,
               location: 'Swap Transaction',
               url_domain: blockExplorerHostName,
             },
diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js
index 4c0413445..2b33e12ea 100644
--- a/ui/pages/swaps/view-quote/view-quote.js
+++ b/ui/pages/swaps/view-quote/view-quote.js
@@ -97,7 +97,7 @@ import CountdownTimer from '../countdown-timer';
 import SwapsFooter from '../swaps-footer';
 import PulseLoader from '../../../components/ui/pulse-loader'; // TODO: Replace this with a different loading component.
 import Box from '../../../components/ui/box';
-import { EVENT } from '../../../../shared/constants/metametrics';
+import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics';
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
 import { parseStandardTokenTransactionData } from '../../../../shared/modules/transaction.utils';
 import { getTokenValueParam } from '../../../../shared/lib/metamask-controller-utils';
@@ -578,7 +578,7 @@ export default function ViewQuote() {
   const trackAllAvailableQuotesOpened = () => {
     trackEvent({
       event: 'All Available Quotes Opened',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         ...eventObjectBase,
         other_quote_selected: usedQuote?.aggregator !== topQuote?.aggregator,
@@ -592,7 +592,7 @@ export default function ViewQuote() {
   const trackQuoteDetailsOpened = () => {
     trackEvent({
       event: 'Quote Details Opened',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         ...eventObjectBase,
         other_quote_selected: usedQuote?.aggregator !== topQuote?.aggregator,
@@ -606,7 +606,7 @@ export default function ViewQuote() {
   const trackEditSpendLimitOpened = () => {
     trackEvent({
       event: 'Edit Spend Limit Opened',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         ...eventObjectBase,
         custom_spend_limit_set: originalApproveAmount === approveAmount,
@@ -618,7 +618,7 @@ export default function ViewQuote() {
   const trackBestQuoteReviewedEvent = useCallback(() => {
     trackEvent({
       event: 'Best Quote Reviewed',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         ...eventObjectBase,
         network_fees: feeInFiat,
@@ -628,7 +628,7 @@ export default function ViewQuote() {
   const trackViewQuotePageLoadedEvent = useCallback(() => {
     trackEvent({
       event: 'View Quote Page Loaded',
-      category: EVENT.CATEGORIES.SWAPS,
+      category: MetaMetricsEventCategory.Swaps,
       sensitiveProperties: {
         ...eventObjectBase,
         response_time: currentTimestamp - reviewSwapClickedTimestamp,
diff --git a/ui/pages/unlock-page/unlock-page.component.js b/ui/pages/unlock-page/unlock-page.component.js
index 2ead9d57b..6410d2674 100644
--- a/ui/pages/unlock-page/unlock-page.component.js
+++ b/ui/pages/unlock-page/unlock-page.component.js
@@ -6,9 +6,9 @@ import TextField from '../../components/ui/text-field';
 import Mascot from '../../components/ui/mascot';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
 import {
-  EVENT,
-  EVENT_NAMES,
-  CONTEXT_PROPS,
+  MetaMetricsContextProp,
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
 } from '../../../shared/constants/metametrics';
 import { SUPPORT_LINK } from '../../../shared/lib/ui-utils';
 import { isBeta } from '../../helpers/utils/build-types';
@@ -80,8 +80,8 @@ export default class UnlockPage extends Component {
       await onSubmit(password);
       this.context.trackEvent(
         {
-          category: EVENT.CATEGORIES.NAVIGATION,
-          event: EVENT_NAMES.APP_UNLOCKED,
+          category: MetaMetricsEventCategory.Navigation,
+          event: MetaMetricsEventName.AppUnlocked,
           properties: {
             failed_attempts: this.failed_attempts,
           },
@@ -96,8 +96,8 @@ export default class UnlockPage extends Component {
       if (message === 'Incorrect password') {
         await forceUpdateMetamaskState();
         this.context.trackEvent({
-          category: EVENT.CATEGORIES.NAVIGATION,
-          event: EVENT_NAMES.APP_UNLOCKED_FAILED,
+          category: MetaMetricsEventCategory.Navigation,
+          event: MetaMetricsEventName.AppUnlockedFailed,
           properties: {
             reason: 'incorrect_password',
             failed_attempts: this.failed_attempts,
@@ -208,15 +208,15 @@ export default class UnlockPage extends Component {
                 onClick={() => {
                   this.context.trackEvent(
                     {
-                      category: EVENT.CATEGORIES.NAVIGATION,
-                      event: EVENT_NAMES.SUPPORT_LINK_CLICKED,
+                      category: MetaMetricsEventCategory.Navigation,
+                      event: MetaMetricsEventName.SupportLinkClicked,
                       properties: {
                         url: SUPPORT_LINK,
                       },
                     },
                     {
                       contextPropsIntoEventProperties: [
-                        CONTEXT_PROPS.PAGE_TITLE,
+                        MetaMetricsContextProp.PageTitle,
                       ],
                     },
                   );
diff --git a/ui/store/action-queue/index.ts b/ui/store/action-queue/index.ts
index 53b8ce822..f4d8aa559 100644
--- a/ui/store/action-queue/index.ts
+++ b/ui/store/action-queue/index.ts
@@ -1,5 +1,8 @@
 import pify from 'pify';
-import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../shared/constants/metametrics';
 import { isManifestV3 } from '../../../shared/modules/mv3.utils';
 import { trackMetaMetricsEvent } from '../actions';
 
@@ -192,8 +195,8 @@ async function processActionRetryQueue() {
   try {
     if (actionRetryQueue.length > 0) {
       const metametricsPayload = {
-        category: EVENT.SOURCE.SERVICE_WORKERS,
-        event: EVENT_NAMES.SERVICE_WORKER_RESTARTED,
+        category: MetaMetricsEventCategory.ServiceWorkers,
+        event: MetaMetricsEventName.ServiceWorkerRestarted,
         properties: {
           service_worker_action_queue_methods: actionRetryQueue.map(
             (action) => action.request.method,
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index cac4f79a3..b0b008add 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -7,7 +7,7 @@ import { TransactionStatus } from '../../shared/constants/transaction';
 import { HardwareDeviceNames } from '../../shared/constants/hardware-wallets';
 import { GAS_LIMITS } from '../../shared/constants/gas';
 import { ORIGIN_METAMASK } from '../../shared/constants/app';
-import { EVENT } from '../../shared/constants/metametrics';
+import { MetaMetricsNetworkEventSource } from '../../shared/constants/metametrics';
 import * as actions from './actions';
 import { _setBackgroundConnection } from './action-queue';
 
@@ -1385,14 +1385,14 @@ describe('Actions', () => {
 
       await store.dispatch(
         actions.upsertNetworkConfiguration(networkConfiguration, {
-          source: EVENT.SOURCE.NETWORK.CUSTOM_NETWORK_FORM,
+          source: MetaMetricsNetworkEventSource.CustomNetworkForm,
         }),
       );
 
       expect(
         upsertNetworkConfigurationStub.calledOnceWith(networkConfiguration, {
           referrer: ORIGIN_METAMASK,
-          source: EVENT.SOURCE.NETWORK.CUSTOM_NETWORK_FORM,
+          source: MetaMetricsNetworkEventSource.CustomNetworkForm,
           setActive: undefined,
         }),
       ).toBe(true);
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 913e7de0d..97be01ad5 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -51,7 +51,7 @@ import {
   LEDGER_USB_VENDOR_ID,
 } from '../../shared/constants/hardware-wallets';
 import {
-  EVENT,
+  MetaMetricsEventCategory,
   MetaMetricsEventFragment,
   MetaMetricsEventOptions,
   MetaMetricsEventPayload,
@@ -4350,7 +4350,7 @@ export async function setSmartTransactionsOptInStatus(
   trackMetaMetricsEvent({
     actionId: generateActionId(),
     event: 'STX OptIn',
-    category: EVENT.CATEGORIES.SWAPS,
+    category: MetaMetricsEventCategory.Swaps,
     sensitiveProperties: {
       stx_enabled: true,
       current_stx_enabled: true,

From f51055802fbe1c3f58e69d333456943bd914d1eb Mon Sep 17 00:00:00 2001
From: Guillaume Roux <guillaumeroux123@gmail.com>
Date: Mon, 3 Apr 2023 18:04:30 +0200
Subject: [PATCH 122/129] [FLASK] Update snap delineator (#18385)

---
 app/_locales/de/messages.json                 |  7 +-
 app/_locales/el/messages.json                 |  7 +-
 app/_locales/en/messages.json                 | 18 +++--
 app/_locales/es/messages.json                 |  7 +-
 app/_locales/fr/messages.json                 |  7 +-
 app/_locales/hi/messages.json                 |  7 +-
 app/_locales/id/messages.json                 |  7 +-
 app/_locales/ja/messages.json                 |  7 +-
 app/_locales/ko/messages.json                 |  7 +-
 app/_locales/pt/messages.json                 |  7 +-
 app/_locales/ru/messages.json                 |  7 +-
 app/_locales/tl/messages.json                 |  7 +-
 app/_locales/tr/messages.json                 |  7 +-
 app/_locales/vi/messages.json                 |  7 +-
 app/_locales/zh_CN/messages.json              |  7 +-
 .../flask/snap-insight.js                     | 42 ++++++-----
 .../flask/snap-authorship/snap-authorship.js  |  4 +-
 .../app/flask/snap-delineator/index.scss      |  2 +-
 .../flask/snap-delineator/snap-delineator.js  | 49 ++++++++----
 .../snap-delineator.stories.js                |  2 +-
 .../snap-delineator/snap-delineator.test.js   | 35 +++++++++
 .../snap-ui-renderer/snap-ui-renderer.js      | 38 ++++++----
 ui/helpers/constants/flask/delineator.test.ts | 23 ++++++
 ui/helpers/constants/flask/delineator.ts      | 17 +++++
 ui/helpers/constants/flask/index.js           |  1 +
 ui/pages/confirmation/confirmation.js         | 74 ++++++++++++-------
 .../templates/flask/snap-alert/snap-alert.js  |  2 +
 .../snap-confirmation/snap-confirmation.js    |  2 +
 .../flask/snap-prompt/snap-prompt.js          |  2 +
 .../flask/snap-install/snap-install.js        | 10 +--
 .../flask/snap-result/snap-result.js          |  5 +-
 .../flask/snap-update/snap-update.js          | 16 ++--
 32 files changed, 275 insertions(+), 165 deletions(-)
 create mode 100644 ui/components/app/flask/snap-delineator/snap-delineator.test.js
 create mode 100644 ui/helpers/constants/flask/delineator.test.ts
 create mode 100644 ui/helpers/constants/flask/delineator.ts
 create mode 100644 ui/helpers/constants/flask/index.js

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index ad9d680ae..e5c86c47b 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Snaps"
   },
-  "snapsInsightError": {
-    "message": "Ein Fehler ist mit $1: $2 aufgetreten",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Transaktions-Einsicht wird geladen ..."
   },
@@ -3375,7 +3371,8 @@
     "message": "Ein Snap wird nur ausgeführt, wenn er aktiviert ist"
   },
   "snapsUIError": {
-    "message": "Die vom Snap spezifizierte UI ist ungültig."
+    "message": "Die vom Snap spezifizierte UI ist ungültig.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Einige Netzwerke können Sicherheits- und/oder Datenschutzrisiken bergen. Informieren Sie sich über die Risiken, bevor Sie ein Netzwerk hinzufügen und nutzen."
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 6817c89bf..4c56dcf01 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Snaps"
   },
-  "snapsInsightError": {
-    "message": "Παρουσιάστηκε ένα σφάλμα με $1: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Φόρτωση πληροφοριών συναλλαγών..."
   },
@@ -3375,7 +3371,8 @@
     "message": "Ένα snap θα εκτελεστεί μόνο εάν είναι ενεργοποιημένο"
   },
   "snapsUIError": {
-    "message": "Η Διεπαφή Χρήστη (UI) που καθορίζεται από το στιγμιότυπο δεν είναι έγκυρη."
+    "message": "Η Διεπαφή Χρήστη (UI) που καθορίζεται από το στιγμιότυπο δεν είναι έγκυρη.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Ορισμένα δίκτυα ενδέχεται να ενέχουν κινδύνους για την ασφάλεια ή/και το απόρρητο. Ενημερωθείτε για τους κινδύνους πριν προσθέσετε και χρησιμοποιήσετε ένα δίκτυο."
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index ef7e9ef0d..abda8fecd 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1374,6 +1374,10 @@
   "errorWhileConnectingToRPC": {
     "message": "Error while connecting to the custom network."
   },
+  "errorWithSnap": {
+    "message": "Error with $1",
+    "description": "$1 represents the name of the snap"
+  },
   "ethGasPriceFetchWarning": {
     "message": "Backup gas price is provided as the main gas estimation service is unavailable right now."
   },
@@ -1801,6 +1805,10 @@
   "inputLogicHigherNumber": {
     "message": "This allows the contract to spend all your token balance until it reaches the cap or you revoke the spending cap. If this is not intended, consider setting a lower spending cap."
   },
+  "insightsFromSnap": {
+    "message": "Insights from $1",
+    "description": "$1 represents the name of the snap"
+  },
   "install": {
     "message": "Install"
   },
@@ -3627,13 +3635,12 @@
   "snaps": {
     "message": "Snaps"
   },
-  "snapsInsightError": {
-    "message": "An error occured with $1: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Loading transaction insight..."
   },
+  "snapsInvalidUIError": {
+    "message": "The UI specified by the snap is invalid."
+  },
   "snapsNoInsight": {
     "message": "The snap didn't return any insight"
   },
@@ -3647,7 +3654,8 @@
     "message": "A snap will only run if it is enabled"
   },
   "snapsUIError": {
-    "message": "The UI specified by the snap is invalid."
+    "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"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Some networks may pose security and/or privacy risks. Understand the risks before adding & using a network."
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 5b580280b..d7d56a93b 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Complementos"
   },
-  "snapsInsightError": {
-    "message": "Ocurrió un error con $1: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Cargando información de transacción..."
   },
@@ -3375,7 +3371,8 @@
     "message": "Un complemento solo se ejecutará si está habilitado"
   },
   "snapsUIError": {
-    "message": "La IU especificada por el complemento no es válida."
+    "message": "La IU especificada por el complemento no es válida.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Algunas redes pueden presentar riesgos de seguridad y/o privacidad. Comprenda los riesgos antes de agregar y utilizar una red."
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index cd3384918..bbdd98c4a 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Snaps"
   },
-  "snapsInsightError": {
-    "message": "Une erreur s’est produite avec $1: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Chargement de l’aperçu de transaction…"
   },
@@ -3375,7 +3371,8 @@
     "message": "Un snap ne s’exécute que s’il est activé"
   },
   "snapsUIError": {
-    "message": "L’interface utilisateur (IU) spécifiée par le snap n’est pas valide."
+    "message": "L’interface utilisateur (IU) spécifiée par le snap n’est pas valide.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Certains réseaux peuvent présenter des risques pour la sécurité et/ou la vie privée. Informez-vous sur les risques avant d’ajouter et d’utiliser un réseau."
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index c6a645cb0..f976670c9 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "स्नैप्स"
   },
-  "snapsInsightError": {
-    "message": "$1: $2 के साथ त्रुटि हुई",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "ट्रांजैक्शन इनसाइट लोड हो रही है..."
   },
@@ -3375,7 +3371,8 @@
     "message": "कोई स्नैप तभी चलेगा जब उसे सक्षम किया गया हो"
   },
   "snapsUIError": {
-    "message": "स्नैप द्वारा विनिर्दिष्टत UI अमान्य है।"
+    "message": "स्नैप द्वारा विनिर्दिष्टत UI अमान्य है।",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "कुछ नेटवर्क सुरक्षा और/या गोपनीयता संबंधी जोखिम पैदा कर सकते हैं। नेटवर्क जोड़ने और उपयोग करने से पहले जोखिमों को समझें।"
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index b1b6f1b04..c4f6316a2 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Snap"
   },
-  "snapsInsightError": {
-    "message": "Terjadi kesalahan dengan $1: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Memuat wawasan transaksi..."
   },
@@ -3375,7 +3371,8 @@
     "message": "Snap hanya akan beroperasi jika diaktifkan"
   },
   "snapsUIError": {
-    "message": "UI yang ditentukan oleh snap tidak valid."
+    "message": "UI yang ditentukan oleh snap tidak valid.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Beberapa jaringan dapat menimbulkan risiko keamanan dan/atau privasi. Pahami risikonya sebelum menambahkan & menggunakan jaringan."
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 2c01188de..e770df626 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "スナップ"
   },
-  "snapsInsightError": {
-    "message": "$1 でエラーが発生しました: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "トランザクションインサイトを読み込み中..."
   },
@@ -3375,7 +3371,8 @@
     "message": "スナップは有効になっている場合にのみ実行されます"
   },
   "snapsUIError": {
-    "message": "スナップにより指定された UI が無効です。"
+    "message": "スナップにより指定された UI が無効です。",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "ネットワークによっては、セキュリティやプライバシーの面でリスクが伴う可能性があります。ネットワークを追加・使用する前にリスクを理解するようにしてください。"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 7fb0bc692..ef63aba70 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "스냅"
   },
-  "snapsInsightError": {
-    "message": "$1 관련 오류 발생: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "거래 인사이트를 가져오는 중..."
   },
@@ -3375,7 +3371,8 @@
     "message": "스냅은 활성화된 상태에서만 작동합니다."
   },
   "snapsUIError": {
-    "message": "스냅에서 지정한 UI가 올바르지 않습니다."
+    "message": "스냅에서 지정한 UI가 올바르지 않습니다.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "네트워크에 따라 보안이나 개인 정보 유출의 위험이 있을 수 있습니다. 네트워크 추가 및 사용 이전에 위험 요소를 파악하세요."
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 456fde9d4..c32d55258 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Snaps"
   },
-  "snapsInsightError": {
-    "message": "Ocorreu um erro com $1: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Carregando insight da transação..."
   },
@@ -3375,7 +3371,8 @@
     "message": "O snap só será executado se estiver ativado"
   },
   "snapsUIError": {
-    "message": "A IU especificada pelo snap é inválida."
+    "message": "A IU especificada pelo snap é inválida.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Algumas redes podem representar riscos de segurança e/ou privacidade. Tenha os riscos em mente antes de adicionar e usar uma rede."
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 16f65a155..bad7ed48f 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Снапы"
   },
-  "snapsInsightError": {
-    "message": "Произошла ошибка с $1: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Загрузка аналитики по транзакции..."
   },
@@ -3375,7 +3371,8 @@
     "message": "Снап будет работать только в том случае, если он включен"
   },
   "snapsUIError": {
-    "message": "Пользовательский интерфейс, указанный привязкой, недействителен."
+    "message": "Пользовательский интерфейс, указанный привязкой, недействителен.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Некоторые сети могут представлять угрозу безопасности и/или конфиденциальности. Прежде чем добавлять и использовать сеть, ознакомьтесь с рисками."
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 80f823d84..8eea14401 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Mga Snap"
   },
-  "snapsInsightError": {
-    "message": "Nagkaroon ng error sa $1: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Naglo-load ng insight sa transaksyon..."
   },
@@ -3375,7 +3371,8 @@
     "message": "Tatakbo lamang ang snap kapag pinagana ito"
   },
   "snapsUIError": {
-    "message": "Ang UI na tinukoy sa pamamagitan ng snap ay hindi wasto."
+    "message": "Ang UI na tinukoy sa pamamagitan ng snap ay hindi wasto.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Maaaring magdulot ang ilang network ng mga panganib sa seguridad at/o pagkapribado. Unawain ang mga panganib bago idagdag o gamitin ang isang network."
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 61da04252..9fb967075 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Snap'ler"
   },
-  "snapsInsightError": {
-    "message": "$1: $2 ile ilgili bir hata oldu",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "İşlem ayrıntıları yükleniyor..."
   },
@@ -3375,7 +3371,8 @@
     "message": "Bir snap yalnızca etkinleştirilmişse çalışır"
   },
   "snapsUIError": {
-    "message": "Snap tarafından belirtilen Kullanıcı Arayüzü geçersiz."
+    "message": "Snap tarafından belirtilen Kullanıcı Arayüzü geçersiz.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Bazı ağlar güvenlik ve/veya gizlilik riskleri teşkil edebilir. Bir ağ eklemeden ve kullanmadan önce riskleri anlayın."
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 97eccee87..dcfabd1d9 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Snap"
   },
-  "snapsInsightError": {
-    "message": "Đã xảy ra lỗi với $1: $2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "Đang tải thông tin chi tiết về giao dịch..."
   },
@@ -3375,7 +3371,8 @@
     "message": "Snap chỉ hoạt động khi đã bật"
   },
   "snapsUIError": {
-    "message": "Giao diện người dùng được chỉ định bởi snap không hợp lệ."
+    "message": "Giao diện người dùng được chỉ định bởi snap không hợp lệ.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "Một số mạng có thể gây ra rủi ro về bảo mật và/hoặc quyền riêng tư. Bạn cần hiểu rõ các rủi ro này trước khi thêm và sử dụng mạng."
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index d000e0c6b..0bce662da 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -3355,10 +3355,6 @@
   "snaps": {
     "message": "Snap"
   },
-  "snapsInsightError": {
-    "message": "$1 发生错误：$2",
-    "description": "This is shown when the insight snap throws an error. $1 is the snap name, $2 is the error message."
-  },
   "snapsInsightLoading": {
     "message": "正在加载交易洞察……"
   },
@@ -3375,7 +3371,8 @@
     "message": "Snap仅在启用后才会运行"
   },
   "snapsUIError": {
-    "message": "Snap指定的用户界面无效。"
+    "message": "Snap指定的用户界面无效。",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
   },
   "someNetworksMayPoseSecurity": {
     "message": "某些网络可能会带来安全和/或隐私风险。在添加和使用网络之前，请先了解风险。"
diff --git a/ui/components/app/confirm-page-container/flask/snap-insight.js b/ui/components/app/confirm-page-container/flask/snap-insight.js
index 3cfafd94d..13d182736 100644
--- a/ui/components/app/confirm-page-container/flask/snap-insight.js
+++ b/ui/components/app/confirm-page-container/flask/snap-insight.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import { useSelector } from 'react-redux';
 import Preloader from '../../../ui/icon/preloader/preloader-icon.component';
 import { Text } from '../../../component-library';
 import {
@@ -14,8 +15,12 @@ import {
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { useTransactionInsightSnap } from '../../../../hooks/flask/useTransactionInsightSnap';
 import Box from '../../../ui/box/box';
-import ActionableMessage from '../../../ui/actionable-message/actionable-message';
 import { SnapUIRenderer } from '../../flask/snap-ui-renderer';
+import { SnapDelineator } from '../../flask/snap-delineator';
+import { DelineatorType } from '../../../../helpers/constants/flask';
+import { getSnapName } from '../../../../helpers/utils/util';
+import { Copyable } from '../../flask/copyable';
+import { getTargetSubjectMetadata } from '../../../../selectors';
 
 export const SnapInsight = ({ transaction, origin, chainId, selectedSnap }) => {
   const t = useI18nContext();
@@ -30,6 +35,12 @@ export const SnapInsight = ({ transaction, origin, chainId, selectedSnap }) => {
     snapId: selectedSnap.id,
   });
 
+  const targetSubjectMetadata = useSelector((state) =>
+    getTargetSubjectMetadata(state, selectedSnap.id),
+  );
+
+  const snapName = getSnapName(selectedSnap.id, targetSubjectMetadata);
+
   const data = response?.content;
 
   const hasNoData =
@@ -52,7 +63,11 @@ export const SnapInsight = ({ transaction, origin, chainId, selectedSnap }) => {
           className="snap-insight__container"
         >
           {data && Object.keys(data).length > 0 ? (
-            <SnapUIRenderer snapId={selectedSnap.id} data={data} />
+            <SnapUIRenderer
+              snapId={selectedSnap.id}
+              data={data}
+              delineatorType={DelineatorType.Insights}
+            />
           ) : (
             <Text
               color={TextColor.textAlternative}
@@ -66,22 +81,13 @@ export const SnapInsight = ({ transaction, origin, chainId, selectedSnap }) => {
       )}
 
       {!loading && error && (
-        <Box
-          paddingTop={0}
-          paddingRight={6}
-          paddingBottom={3}
-          paddingLeft={6}
-          className="snap-insight__container__error"
-        >
-          <ActionableMessage
-            message={t('snapsInsightError', [
-              selectedSnap.manifest.proposedName,
-              error.message,
-            ])}
-            type="danger"
-            useIcon
-            iconFillColor="var(--color-error-default)"
-          />
+        <Box padding={4} className="snap-insight__container__error">
+          <SnapDelineator snapName={snapName} type={DelineatorType.Error}>
+            <Text variant={TextVariant.bodySm} marginBottom={4}>
+              {t('snapsUIError', [<b key="0">{snapName}</b>])}
+            </Text>
+            <Copyable text={error.message} />
+          </SnapDelineator>
         </Box>
       )}
 
diff --git a/ui/components/app/flask/snap-authorship/snap-authorship.js b/ui/components/app/flask/snap-authorship/snap-authorship.js
index 4179c5cbf..996c01b77 100644
--- a/ui/components/app/flask/snap-authorship/snap-authorship.js
+++ b/ui/components/app/flask/snap-authorship/snap-authorship.js
@@ -14,6 +14,7 @@ import {
   AlignItems,
   DISPLAY,
   BorderRadius,
+  BLOCK_SIZES,
 } from '../../../../helpers/constants/design-system';
 import {
   getSnapName,
@@ -59,7 +60,7 @@ const SnapAuthorship = ({ snapId, className }) => {
       paddingRight={4}
       borderRadius={BorderRadius.pill}
       display={DISPLAY.FLEX}
-      style={{ maxWidth: 'fit-content', width: '100%' }}
+      width={BLOCK_SIZES.FULL}
     >
       <Box>
         <SnapAvatar snapId={snapId} />
@@ -87,6 +88,7 @@ const SnapAuthorship = ({ snapId, className }) => {
         iconName={ICON_NAMES.EXPORT}
         color={IconColor.infoDefault}
         size={ICON_SIZES.MD}
+        style={{ marginLeft: 'auto' }}
       />
     </Box>
   );
diff --git a/ui/components/app/flask/snap-delineator/index.scss b/ui/components/app/flask/snap-delineator/index.scss
index 17e5be8b0..697dfb68f 100644
--- a/ui/components/app/flask/snap-delineator/index.scss
+++ b/ui/components/app/flask/snap-delineator/index.scss
@@ -1,7 +1,7 @@
 .snap-delineator {
   &__header {
     border-bottom-width: 1px;
-    border-color: var(--color-border-muted);
+    border-color: var(--color-border-default);
     border-style: solid;
     border-radius: 8px 8px 0 0;
 
diff --git a/ui/components/app/flask/snap-delineator/snap-delineator.js b/ui/components/app/flask/snap-delineator/snap-delineator.js
index dd1017045..a397f5bc9 100644
--- a/ui/components/app/flask/snap-delineator/snap-delineator.js
+++ b/ui/components/app/flask/snap-delineator/snap-delineator.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import {
   BorderStyle,
-  Size,
   BorderColor,
   BorderRadius,
   AlignItems,
@@ -13,37 +12,60 @@ import {
   TextColor,
 } from '../../../../helpers/constants/design-system';
 import Box from '../../../ui/box';
-import { Icon, Text } from '../../../component-library';
+import {
+  AvatarIcon,
+  ICON_NAMES,
+  ICON_SIZES,
+  Text,
+} from '../../../component-library';
+import {
+  DelineatorType,
+  getDelineatorTitle,
+} from '../../../../helpers/constants/flask';
 
-export const SnapDelineator = ({ snapName, children }) => {
+export const SnapDelineator = ({
+  snapName,
+  type = DelineatorType.default,
+  children,
+}) => {
   const t = useI18nContext();
-
+  const isError = type === DelineatorType.Error;
   return (
     <Box
       className="snap-delineator__wrapper"
       borderStyle={BorderStyle.solid}
-      borderColor={BorderColor.borderMuted}
+      borderColor={BorderColor.borderDefault}
       borderRadius={BorderRadius.LG}
+      backgroundColor={
+        isError ? BackgroundColor.errorMuted : BackgroundColor.backgroundDefault
+      }
     >
       <Box
         className="snap-delineator__header"
         alignItems={AlignItems.center}
-        backgroundColor={BackgroundColor.infoMuted}
-        paddingLeft={2}
-        paddingRight={2}
-        paddingTop={1}
-        paddingBottom={1}
+        padding={1}
       >
-        <Icon name="snaps" color={IconColor.infoDefault} size={Size.SM} />
+        <AvatarIcon
+          iconName={ICON_NAMES.SNAPS}
+          size={ICON_SIZES.XS}
+          backgroundColor={
+            isError ? IconColor.errorDefault : IconColor.infoDefault
+          }
+          margin={1}
+          iconProps={{
+            size: ICON_SIZES.XS,
+            color: IconColor.infoInverse,
+          }}
+        />
         <Text
           variant={TextVariant.bodySm}
-          color={TextColor.infoDefault}
+          color={isError ? TextColor.errorDefault : TextColor.default}
           className="snap-delineator__header__text"
           marginLeft={1}
           marginTop={0}
           marginBottom={0}
         >
-          {t('contentFromSnap', [snapName])}
+          {t(getDelineatorTitle(type), [snapName])}
         </Text>
       </Box>
       <Box className="snap-delineator__content" padding={4}>
@@ -55,5 +77,6 @@ export const SnapDelineator = ({ snapName, children }) => {
 
 SnapDelineator.propTypes = {
   snapName: PropTypes.string,
+  type: PropTypes.string,
   children: PropTypes.ReactNode,
 };
diff --git a/ui/components/app/flask/snap-delineator/snap-delineator.stories.js b/ui/components/app/flask/snap-delineator/snap-delineator.stories.js
index e2e60e685..563232426 100644
--- a/ui/components/app/flask/snap-delineator/snap-delineator.stories.js
+++ b/ui/components/app/flask/snap-delineator/snap-delineator.stories.js
@@ -6,5 +6,5 @@ export default {
 };
 
 export const DefaultStory = () => (
-  <SnapDelineator snapId="foo">Children</SnapDelineator>
+  <SnapDelineator snapName="foo">Children</SnapDelineator>
 );
diff --git a/ui/components/app/flask/snap-delineator/snap-delineator.test.js b/ui/components/app/flask/snap-delineator/snap-delineator.test.js
new file mode 100644
index 000000000..e9553c730
--- /dev/null
+++ b/ui/components/app/flask/snap-delineator/snap-delineator.test.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import { DelineatorType } from '../../../../helpers/constants/flask';
+import { renderWithLocalization } from '../../../../../test/lib/render-helpers';
+import { SnapDelineator } from './snap-delineator';
+
+describe('SnapDelineator', () => {
+  const args = {
+    snapName: 'Test Snap',
+    type: DelineatorType.Content,
+    children: 'This is some test content',
+  };
+
+  it('should render the SnapDelineator with content inside', () => {
+    const { getByText } = renderWithLocalization(<SnapDelineator {...args} />);
+
+    expect(getByText(/Content from Test Snap/u)).toBeDefined();
+    expect(getByText(args.children)).toBeDefined();
+  });
+
+  it('should render an insight title', () => {
+    args.type = DelineatorType.Insights;
+
+    const { getByText } = renderWithLocalization(<SnapDelineator {...args} />);
+
+    expect(getByText(/Insights from Test Snap/u)).toBeDefined();
+  });
+
+  it('should render an error title', () => {
+    args.type = DelineatorType.Error;
+
+    const { getByText } = renderWithLocalization(<SnapDelineator {...args} />);
+
+    expect(getByText(/Error with Test Snap/u)).toBeDefined();
+  });
+});
diff --git a/ui/components/app/flask/snap-ui-renderer/snap-ui-renderer.js b/ui/components/app/flask/snap-ui-renderer/snap-ui-renderer.js
index 731bd599f..20197923f 100644
--- a/ui/components/app/flask/snap-ui-renderer/snap-ui-renderer.js
+++ b/ui/components/app/flask/snap-ui-renderer/snap-ui-renderer.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useSelector } from 'react-redux';
 import nanoid from 'nanoid';
 import { isComponent } from '@metamask/snaps-ui';
+import { useSelector } from 'react-redux';
 import MetaMaskTemplateRenderer from '../../metamask-template-renderer/metamask-template-renderer';
 import {
   TypographyVariant,
@@ -10,12 +10,16 @@ import {
   DISPLAY,
   FLEX_DIRECTION,
   OVERFLOW_WRAP,
+  TextVariant,
 } from '../../../../helpers/constants/design-system';
 import { SnapDelineator } from '../snap-delineator';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import ActionableMessage from '../../../ui/actionable-message/actionable-message';
 import Box from '../../../ui/box';
-import { getSnap } from '../../../../selectors';
+import { getSnapName } from '../../../../helpers/utils/util';
+import { getTargetSubjectMetadata } from '../../../../selectors';
+import { Text } from '../../../component-library';
+import { Copyable } from '../copyable';
+import { DelineatorType } from '../../../../helpers/constants/flask';
 
 export const UI_MAPPING = {
   panel: (props) => ({
@@ -70,22 +74,25 @@ export const mapToTemplate = (data) => {
 };
 
 // Component that maps Snaps UI JSON format to MetaMask Template Renderer format
-export const SnapUIRenderer = ({ snapId, data }) => {
+export const SnapUIRenderer = ({
+  snapId,
+  delineatorType = DelineatorType.Content,
+  data,
+}) => {
   const t = useI18nContext();
-  const snap = useSelector((state) => getSnap(state, snapId));
+  const targetSubjectMetadata = useSelector((state) =>
+    getTargetSubjectMetadata(state, snapId),
+  );
 
-  const snapName = snap.manifest.proposedName;
+  const snapName = getSnapName(snapId, targetSubjectMetadata);
 
   if (!isComponent(data)) {
     return (
-      <SnapDelineator snapName={snapName}>
-        <ActionableMessage
-          className="snap-ui-renderer__error"
-          message={t('snapsUIError')}
-          type="danger"
-          useIcon
-          iconFillColor="var(--color-error-default)"
-        />
+      <SnapDelineator snapName={snapName} type={DelineatorType.Error}>
+        <Text variant={TextVariant.bodySm} marginBottom={4}>
+          {t('snapsUIError', [<b key="0">{snapName}</b>])}
+        </Text>
+        <Copyable text={t('snapsInvalidUIError')} />
       </SnapDelineator>
     );
   }
@@ -93,7 +100,7 @@ export const SnapUIRenderer = ({ snapId, data }) => {
   const sections = mapToTemplate(data);
 
   return (
-    <SnapDelineator snapName={snapName}>
+    <SnapDelineator snapName={snapName} type={delineatorType}>
       <Box className="snap-ui-renderer__content">
         <MetaMaskTemplateRenderer sections={sections} />
       </Box>
@@ -103,5 +110,6 @@ export const SnapUIRenderer = ({ snapId, data }) => {
 
 SnapUIRenderer.propTypes = {
   snapId: PropTypes.string,
+  delineatorType: PropTypes.string,
   data: PropTypes.object,
 };
diff --git a/ui/helpers/constants/flask/delineator.test.ts b/ui/helpers/constants/flask/delineator.test.ts
new file mode 100644
index 000000000..285d89dfd
--- /dev/null
+++ b/ui/helpers/constants/flask/delineator.test.ts
@@ -0,0 +1,23 @@
+import { DelineatorType, getDelineatorTitle } from './delineator';
+
+describe('delineator utils', () => {
+  describe('getDelineatorTitle', () => {
+    it('should return the good key for an error delineator type', () => {
+      const result = getDelineatorTitle(DelineatorType.Error);
+
+      expect(result).toStrictEqual('errorWithSnap');
+    });
+
+    it('should return the good key for an insights delineator type', () => {
+      const result = getDelineatorTitle(DelineatorType.Insights);
+
+      expect(result).toStrictEqual('insightsFromSnap');
+    });
+
+    it('should return the content key for any other types', () => {
+      const result = getDelineatorTitle(DelineatorType.Content);
+
+      expect(result).toStrictEqual('contentFromSnap');
+    });
+  });
+});
diff --git a/ui/helpers/constants/flask/delineator.ts b/ui/helpers/constants/flask/delineator.ts
new file mode 100644
index 000000000..ce5d5002b
--- /dev/null
+++ b/ui/helpers/constants/flask/delineator.ts
@@ -0,0 +1,17 @@
+export enum DelineatorType {
+  Content = 'content',
+  // eslint-disable-next-line @typescript-eslint/no-shadow
+  Error = 'error',
+  Insights = 'insights',
+}
+
+export const getDelineatorTitle = (type: DelineatorType) => {
+  switch (type) {
+    case DelineatorType.Error:
+      return 'errorWithSnap';
+    case DelineatorType.Insights:
+      return 'insightsFromSnap';
+    default:
+      return 'contentFromSnap';
+  }
+};
diff --git a/ui/helpers/constants/flask/index.js b/ui/helpers/constants/flask/index.js
new file mode 100644
index 000000000..cafa4fe13
--- /dev/null
+++ b/ui/helpers/constants/flask/index.js
@@ -0,0 +1 @@
+export * from './delineator';
diff --git a/ui/pages/confirmation/confirmation.js b/ui/pages/confirmation/confirmation.js
index d9c75e597..056ce1e99 100644
--- a/ui/pages/confirmation/confirmation.js
+++ b/ui/pages/confirmation/confirmation.js
@@ -17,6 +17,7 @@ import MetaMaskTemplateRenderer from '../../components/app/metamask-template-ren
 import ConfirmationWarningModal from '../../components/app/confirmation-warning-modal';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
 import {
+  AlignItems,
   FLEX_DIRECTION,
   Size,
   TextColor,
@@ -25,7 +26,7 @@ import { useI18nContext } from '../../hooks/useI18nContext';
 import { useOriginMetadata } from '../../hooks/useOriginMetadata';
 import {
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  getSnap,
+  getTargetSubjectMetadata,
   ///: END:ONLY_INCLUDE_IN
   getUnapprovedTemplatedConfirmations,
   getUnapprovedTxCount,
@@ -34,6 +35,10 @@ import NetworkDisplay from '../../components/app/network-display/network-display
 import Callout from '../../components/ui/callout';
 import SiteOrigin from '../../components/ui/site-origin';
 import { Icon, ICON_NAMES } from '../../components/component-library';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import SnapAuthorship from '../../components/app/flask/snap-authorship/snap-authorship';
+import { getSnapName } from '../../helpers/utils/util';
+///: END:ONLY_INCLUDE_IN
 import ConfirmationFooter from './components/confirmation-footer';
 import {
   getTemplateValues,
@@ -183,12 +188,14 @@ export default function ConfirmationPage({
   const [submitAlerts, setSubmitAlerts] = useState([]);
 
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  const snap = useSelector((state) =>
-    getSnap(state, pendingConfirmation?.origin),
+  const targetSubjectMetadata = useSelector((state) =>
+    getTargetSubjectMetadata(state, pendingConfirmation?.origin),
   );
 
   // When pendingConfirmation is undefined, this will also be undefined
-  const proposedName = snap?.manifest.proposedName;
+  const snapName =
+    targetSubjectMetadata &&
+    getSnapName(pendingConfirmation?.origin, targetSubjectMetadata);
 
   const SNAP_DIALOG_TYPE = [
     MESSAGE_TYPE.SNAP_DIALOG_ALERT,
@@ -213,7 +220,7 @@ export default function ConfirmationPage({
       ? getTemplateValues(
           {
             ///: BEGIN:ONLY_INCLUDE_IN(flask)
-            snapName: isSnapDialog && proposedName,
+            snapName: isSnapDialog && snapName,
             ///: END:ONLY_INCLUDE_IN
             ...pendingConfirmation,
           },
@@ -230,7 +237,7 @@ export default function ConfirmationPage({
     history,
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     isSnapDialog,
-    proposedName,
+    snapName,
     ///: END:ONLY_INCLUDE_IN
   ]);
 
@@ -327,25 +334,42 @@ export default function ConfirmationPage({
             />
           </Box>
         ) : null}
-        {pendingConfirmation.origin === 'metamask' ? null : (
-          <Box
-            alignItems="center"
-            marginTop={1}
-            paddingTop={1}
-            paddingRight={4}
-            paddingLeft={4}
-            paddingBottom={4}
-            flexDirection={FLEX_DIRECTION.COLUMN}
-          >
-            <SiteOrigin
-              chip
-              siteOrigin={originMetadata.origin}
-              title={originMetadata.origin}
-              iconSrc={originMetadata.iconUrl}
-              iconName={originMetadata.hostname}
-            />
-          </Box>
-        )}
+        {
+          ///: BEGIN:ONLY_INCLUDE_IN(flask)
+          !isSnapDialog &&
+            ///: END:ONLY_INCLUDE_IN
+            pendingConfirmation.origin === 'metamask' && (
+              <Box
+                alignItems={AlignItems.center}
+                paddingTop={2}
+                paddingRight={4}
+                paddingLeft={4}
+                paddingBottom={4}
+                flexDirection={FLEX_DIRECTION.COLUMN}
+              >
+                <SiteOrigin
+                  chip
+                  siteOrigin={originMetadata.origin}
+                  title={originMetadata.origin}
+                  iconSrc={originMetadata.iconUrl}
+                  iconName={originMetadata.hostname}
+                />
+              </Box>
+            )
+        }
+        {
+          ///: BEGIN:ONLY_INCLUDE_IN(flask)
+          isSnapDialog && (
+            <Box
+              alignItems="center"
+              margin={4}
+              flexDirection={FLEX_DIRECTION.COLUMN}
+            >
+              <SnapAuthorship snapId={pendingConfirmation?.origin} />
+            </Box>
+          )
+          ///: END:ONLY_INCLUDE_IN
+        }
         <MetaMaskTemplateRenderer sections={templatedValues.content} />
         {showWarningModal && (
           <ConfirmationWarningModal
diff --git a/ui/pages/confirmation/templates/flask/snap-alert/snap-alert.js b/ui/pages/confirmation/templates/flask/snap-alert/snap-alert.js
index 0f7e53683..f4b39dbc0 100644
--- a/ui/pages/confirmation/templates/flask/snap-alert/snap-alert.js
+++ b/ui/pages/confirmation/templates/flask/snap-alert/snap-alert.js
@@ -1,4 +1,5 @@
 import { mapToTemplate } from '../../../../../components/app/flask/snap-ui-renderer';
+import { DelineatorType } from '../../../../../helpers/constants/flask';
 
 function getValues(pendingApproval, t, actions) {
   const {
@@ -19,6 +20,7 @@ function getValues(pendingApproval, t, actions) {
           element: 'SnapDelineator',
           key: 'snap-delineator',
           props: {
+            type: DelineatorType.Content,
             snapName,
           },
           // TODO: Replace with SnapUIRenderer when we don't need to inject the input manually.
diff --git a/ui/pages/confirmation/templates/flask/snap-confirmation/snap-confirmation.js b/ui/pages/confirmation/templates/flask/snap-confirmation/snap-confirmation.js
index 88f875044..942ebab9c 100644
--- a/ui/pages/confirmation/templates/flask/snap-confirmation/snap-confirmation.js
+++ b/ui/pages/confirmation/templates/flask/snap-confirmation/snap-confirmation.js
@@ -1,5 +1,6 @@
 import { TypographyVariant } from '../../../../../helpers/constants/design-system';
 import { mapToTemplate } from '../../../../../components/app/flask/snap-ui-renderer';
+import { DelineatorType } from '../../../../../helpers/constants/flask';
 
 function getValues(pendingApproval, t, actions) {
   const {
@@ -20,6 +21,7 @@ function getValues(pendingApproval, t, actions) {
           element: 'SnapDelineator',
           key: 'snap-delineator',
           props: {
+            type: DelineatorType.Content,
             snapName,
           },
           // TODO: Replace with SnapUIRenderer when we don't need to inject the input manually.
diff --git a/ui/pages/confirmation/templates/flask/snap-prompt/snap-prompt.js b/ui/pages/confirmation/templates/flask/snap-prompt/snap-prompt.js
index 416f95771..b54db0e03 100644
--- a/ui/pages/confirmation/templates/flask/snap-prompt/snap-prompt.js
+++ b/ui/pages/confirmation/templates/flask/snap-prompt/snap-prompt.js
@@ -1,5 +1,6 @@
 import { mapToTemplate } from '../../../../../components/app/flask/snap-ui-renderer';
 import { MESSAGE_TYPE } from '../../../../../../shared/constants/app';
+import { DelineatorType } from '../../../../../helpers/constants/flask';
 
 function getValues(pendingApproval, t, actions, _history, setInputState) {
   const {
@@ -20,6 +21,7 @@ function getValues(pendingApproval, t, actions, _history, setInputState) {
           element: 'SnapDelineator',
           key: 'snap-delineator',
           props: {
+            type: DelineatorType.Content,
             snapName,
           },
           children: [
diff --git a/ui/pages/permissions-connect/flask/snap-install/snap-install.js b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
index 6224155b6..776cd7323 100644
--- a/ui/pages/permissions-connect/flask/snap-install/snap-install.js
+++ b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
@@ -87,6 +87,8 @@ export default function SnapInstall({
         className="headers"
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
+        paddingLeft={4}
+        paddingRight={4}
       >
         <SnapAuthorship snapId={targetSubjectMetadata.origin} />
         {!hasError && (
@@ -111,8 +113,6 @@ export default function SnapInstall({
           <>
             <Text
               className="headers__permission-description"
-              paddingLeft={4}
-              paddingRight={4}
               paddingBottom={4}
               textAlign={TEXT_ALIGN.CENTER}
             >
@@ -133,11 +133,7 @@ export default function SnapInstall({
             alignItems={AlignItems.center}
             justifyContent={JustifyContent.center}
           >
-            <Text
-              paddingLeft={4}
-              paddingRight={4}
-              textAlign={TEXT_ALIGN.CENTER}
-            >
+            <Text textAlign={TEXT_ALIGN.CENTER}>
               {t('snapInstallRequest', [
                 <b key="1">{originMetadata?.hostname}</b>,
                 <b key="2">{snapName}</b>,
diff --git a/ui/pages/permissions-connect/flask/snap-result/snap-result.js b/ui/pages/permissions-connect/flask/snap-result/snap-result.js
index 08e702097..d821e63c3 100644
--- a/ui/pages/permissions-connect/flask/snap-result/snap-result.js
+++ b/ui/pages/permissions-connect/flask/snap-result/snap-result.js
@@ -49,6 +49,8 @@ export default function SnapResult({
     >
       <Box
         className="headers"
+        paddingLeft={4}
+        paddingRight={4}
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
@@ -69,7 +71,8 @@ export default function SnapResult({
             alignItems={AlignItems.center}
             justifyContent={JustifyContent.center}
             height={BLOCK_SIZES.FULL}
-            padding={2}
+            paddingTop={2}
+            paddingBottom={2}
           >
             <Text
               fontWeight={FONT_WEIGHT.BOLD}
diff --git a/ui/pages/permissions-connect/flask/snap-update/snap-update.js b/ui/pages/permissions-connect/flask/snap-update/snap-update.js
index 9630ad042..e6d6d7920 100644
--- a/ui/pages/permissions-connect/flask/snap-update/snap-update.js
+++ b/ui/pages/permissions-connect/flask/snap-update/snap-update.js
@@ -91,12 +91,18 @@ export default function SnapUpdate({
     >
       <Box
         className="headers"
+        paddingLeft={4}
+        paddingRight={4}
         alignItems={AlignItems.center}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
         <SnapAuthorship snapId={targetSubjectMetadata.origin} />
         {!hasError && (
-          <Text padding={[4, 4, 0, 4]} variant={TextVariant.headingLg}>
+          <Text
+            paddingBottom={4}
+            paddingTop={4}
+            variant={TextVariant.headingLg}
+          >
             {t('snapUpdate')}
           </Text>
         )}
@@ -117,8 +123,6 @@ export default function SnapUpdate({
           <>
             <Text
               className="headers__permission-description"
-              paddingLeft={4}
-              paddingRight={4}
               paddingBottom={4}
               textAlign={TEXT_ALIGN.CENTER}
             >
@@ -141,11 +145,7 @@ export default function SnapUpdate({
             alignItems={AlignItems.center}
             justifyContent={JustifyContent.center}
           >
-            <Text
-              paddingLeft={4}
-              paddingRight={4}
-              textAlign={TEXT_ALIGN.CENTER}
-            >
+            <Text textAlign={TEXT_ALIGN.CENTER}>
               {t('snapUpdateRequest', [
                 <b key="1">{originMetadata?.hostname}</b>,
                 <b key="2">{snapName}</b>,

From 8603a4b06760618a63f2da0443ab770cc0dd878d Mon Sep 17 00:00:00 2001
From: David Drazic <david@timechaser.org>
Date: Mon, 3 Apr 2023 19:33:54 +0200
Subject: [PATCH 123/129] [FLASK] Add permission cell component (#18372)

* Add permission cell component

Add storybook and handling for revoked permission colors

* Fix things after conflict resolve after rebase

* Add code refactoring and minor UI changes

* Add permission cell component to snap-update flow

* Update storybook

* Add unit tests for permission cell

* Update component padding

* Fix spacing between permission cells

* Fix main icon color for approved permissions

* Update width value with constant
---
 app/_locales/en/messages.json                 |   2 +-
 ui/components/app/app-components.scss         |   1 +
 .../update-snap-permission-list.js            |  99 +++++++-------
 ui/components/app/permission-cell/index.js    |   1 +
 ui/components/app/permission-cell/index.scss  |   5 +
 .../app/permission-cell/permission-cell.js    | 126 ++++++++++++++++++
 .../permission-cell.stories.js                |  22 +++
 .../permission-cell/permission-cell.test.js   |  69 ++++++++++
 .../permissions-connect-permission-list.js    |  43 +++---
 ui/helpers/utils/permission.js                |  93 +++----------
 .../flask/snap-install/index.scss             |   9 --
 .../settings/flask/view-snap/view-snap.js     |   3 +-
 12 files changed, 309 insertions(+), 164 deletions(-)
 create mode 100644 ui/components/app/permission-cell/index.js
 create mode 100644 ui/components/app/permission-cell/index.scss
 create mode 100644 ui/components/app/permission-cell/permission-cell.js
 create mode 100644 ui/components/app/permission-cell/permission-cell.stories.js
 create mode 100644 ui/components/app/permission-cell/permission-cell.test.js

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index abda8fecd..fb45872eb 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -2927,7 +2927,7 @@
     "description": "An extended description for the `snap_getBip32Entropy` permission. $1 is a derivation path (name)"
   },
   "permission_manageBip44Keys": {
-    "message": "Control your \"$1\" accounts and assets.",
+    "message": "Control your $1 accounts and assets.",
     "description": "The description for the `snap_getBip44Entropy` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
   },
   "permission_manageBip44KeysDescription": {
diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss
index 9659eaad3..196ab6c90 100644
--- a/ui/components/app/app-components.scss
+++ b/ui/components/app/app-components.scss
@@ -59,6 +59,7 @@
 @import 'permissions-connect-footer/index';
 @import 'permissions-connect-header/index';
 @import 'permissions-connect-permission-list/index';
+@import 'permission-cell/index';
 @import 'recovery-phrase-reminder/index';
 @import 'set-approval-for-all-warning/index';
 @import 'step-progress-bar/index.scss';
diff --git a/ui/components/app/flask/update-snap-permission-list/update-snap-permission-list.js b/ui/components/app/flask/update-snap-permission-list/update-snap-permission-list.js
index f787628e9..85f3373d4 100644
--- a/ui/components/app/flask/update-snap-permission-list/update-snap-permission-list.js
+++ b/ui/components/app/flask/update-snap-permission-list/update-snap-permission-list.js
@@ -1,14 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { isFunction } from 'lodash';
-import {
-  getRightIcon,
-  getWeightedPermissions,
-} from '../../../../helpers/utils/permission';
+import { getWeightedPermissions } from '../../../../helpers/utils/permission';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import { formatDate } from '../../../../helpers/utils/util';
-import Typography from '../../../ui/typography/typography';
-import { TextColor } from '../../../../helpers/constants/design-system';
+import PermissionCell from '../../permission-cell';
+import Box from '../../../ui/box';
 
 export default function UpdateSnapPermissionList({
   approvedPermissions,
@@ -17,52 +12,50 @@ export default function UpdateSnapPermissionList({
 }) {
   const t = useI18nContext();
 
-  const Permissions = ({ className, permissions, subText }) => {
-    return getWeightedPermissions(t, permissions).map((permission) => {
-      const { label, permissionName, permissionValue } = permission;
-      return (
-        <div className={className} key={permissionName}>
-          <i className="fas fa-x" />
-          <div className="permission-description">
-            {label}
-            <Typography
-              color={TextColor.textAlternative}
-              boxProps={{ paddingTop: 1 }}
-              className="permission-description-subtext"
-            >
-              {isFunction(subText)
-                ? subText(permissionName, permissionValue)
-                : subText}
-            </Typography>
-          </div>
-          {getRightIcon(permission)}
-        </div>
-      );
-    });
-  };
-
   return (
-    <div className="update-snap-permission-list">
-      <Permissions
-        className="new-permission"
-        permissions={newPermissions}
-        subText={t('permissionRequested')}
-      />
-      <Permissions
-        className="approved-permission"
-        permissions={approvedPermissions}
-        subText={(_, permissionValue) => {
-          const { date } = permissionValue;
-          const formattedDate = formatDate(date, 'yyyy-MM-dd');
-          return t('approvedOn', [formattedDate]);
-        }}
-      />
-      <Permissions
-        className="revoked-permission"
-        permissions={revokedPermissions}
-        subText={t('permissionRevoked')}
-      />
-    </div>
+    <Box paddingTop={1}>
+      {getWeightedPermissions(t, newPermissions).map((permission, index) => {
+        return (
+          <PermissionCell
+            title={permission.label}
+            description={permission.description}
+            weight={permission.weight}
+            avatarIcon={permission.leftIcon}
+            dateApproved={permission?.permissionValue?.date}
+            key={`${permission.permissionName}-${index}`}
+          />
+        );
+      })}
+      {getWeightedPermissions(t, approvedPermissions).map(
+        (permission, index) => {
+          return (
+            <PermissionCell
+              title={permission.label}
+              description={permission.description}
+              weight={permission.weight}
+              avatarIcon={permission.leftIcon}
+              dateApproved={permission?.permissionValue?.date}
+              key={`${permission.permissionName}-${index}`}
+            />
+          );
+        },
+      )}
+      {getWeightedPermissions(t, revokedPermissions).map(
+        (permission, index) => {
+          return (
+            <PermissionCell
+              title={permission.label}
+              description={permission.description}
+              weight={permission.weight}
+              avatarIcon={permission.leftIcon}
+              dateApproved={permission?.permissionValue?.date}
+              key={`${permission.permissionName}-${index}`}
+              revoked
+            />
+          );
+        },
+      )}
+    </Box>
   );
 }
 
diff --git a/ui/components/app/permission-cell/index.js b/ui/components/app/permission-cell/index.js
new file mode 100644
index 000000000..4972ccc53
--- /dev/null
+++ b/ui/components/app/permission-cell/index.js
@@ -0,0 +1 @@
+export { default } from './permission-cell';
diff --git a/ui/components/app/permission-cell/index.scss b/ui/components/app/permission-cell/index.scss
new file mode 100644
index 000000000..95034015d
--- /dev/null
+++ b/ui/components/app/permission-cell/index.scss
@@ -0,0 +1,5 @@
+.permission-cell {
+  &__title-revoked {
+    text-decoration: line-through;
+  }
+}
diff --git a/ui/components/app/permission-cell/permission-cell.js b/ui/components/app/permission-cell/permission-cell.js
new file mode 100644
index 000000000..1090b3958
--- /dev/null
+++ b/ui/components/app/permission-cell/permission-cell.js
@@ -0,0 +1,126 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import Box from '../../ui/box';
+import {
+  AlignItems,
+  Color,
+  IconColor,
+  JustifyContent,
+  Size,
+  TextColor,
+  TextVariant,
+} from '../../../helpers/constants/design-system';
+import {
+  AvatarIcon,
+  Icon,
+  ICON_NAMES,
+  ICON_SIZES,
+  Text,
+} from '../../component-library';
+import { formatDate } from '../../../helpers/utils/util';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import Tooltip from '../../ui/tooltip';
+
+const PermissionCell = ({
+  title,
+  description,
+  weight,
+  avatarIcon,
+  dateApproved,
+  revoked,
+}) => {
+  const t = useI18nContext();
+
+  let infoIconColor = IconColor.iconMuted;
+  let infoIcon = ICON_NAMES.INFO;
+  let iconColor = Color.primaryDefault;
+  let iconBackgroundColor = Color.primaryMuted;
+
+  if (!revoked && weight === 1) {
+    iconColor = Color.warningDefault;
+    iconBackgroundColor = Color.warningMuted;
+    infoIconColor = IconColor.warningDefault;
+    infoIcon = ICON_NAMES.DANGER;
+  }
+
+  if (dateApproved) {
+    iconColor = Color.iconMuted;
+    iconBackgroundColor = Color.backgroundAlternative;
+  }
+
+  if (revoked) {
+    iconColor = Color.iconMuted;
+    iconBackgroundColor = Color.backgroundAlternative;
+  }
+
+  return (
+    <Box
+      className="permission-cell"
+      justifyContent={JustifyContent.center}
+      alignItems={AlignItems.flexStart}
+      marginLeft={4}
+      marginRight={4}
+      paddingTop={2}
+      paddingBottom={2}
+    >
+      <Box>
+        {typeof avatarIcon === 'string' ? (
+          <AvatarIcon
+            iconName={avatarIcon}
+            size={ICON_SIZES.MD}
+            iconProps={{
+              size: ICON_SIZES.SM,
+            }}
+            color={iconColor}
+            backgroundColor={iconBackgroundColor}
+          />
+        ) : (
+          avatarIcon
+        )}
+      </Box>
+      <Box width="full" marginLeft={4} marginRight={4}>
+        <Text
+          size={Size.MD}
+          variant={TextVariant.bodyMd}
+          className={classnames('permission-cell__title', {
+            'permission-cell__title-revoked': revoked,
+          })}
+        >
+          {title}
+        </Text>
+        <Text
+          size={Size.XS}
+          className="permission-cell__status"
+          variant={TextVariant.bodyXs}
+          color={TextColor.textAlternative}
+        >
+          {!revoked &&
+            (dateApproved
+              ? t('approvedOn', [formatDate(dateApproved, 'yyyy-MM-dd')])
+              : t('permissionRequested'))}
+          {revoked ? t('permissionRevoked') : ''}
+        </Text>
+      </Box>
+      <Box>
+        <Tooltip html={<div>{description}</div>} position="bottom">
+          <Icon color={infoIconColor} name={infoIcon} size={ICON_SIZES.SM} />
+        </Tooltip>
+      </Box>
+    </Box>
+  );
+};
+
+PermissionCell.propTypes = {
+  title: PropTypes.oneOfType([
+    PropTypes.string.isRequired,
+    PropTypes.object.isRequired,
+  ]),
+  description: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
+  weight: PropTypes.number,
+  avatarIcon: PropTypes.any.isRequired,
+  dateApproved: PropTypes.number,
+  revoked: PropTypes.bool,
+};
+
+export default PermissionCell;
diff --git a/ui/components/app/permission-cell/permission-cell.stories.js b/ui/components/app/permission-cell/permission-cell.stories.js
new file mode 100644
index 000000000..986b9d326
--- /dev/null
+++ b/ui/components/app/permission-cell/permission-cell.stories.js
@@ -0,0 +1,22 @@
+import React from 'react';
+import PermissionCell from '.';
+
+export default {
+  title: 'Components/App/PermissionCell',
+
+  component: PermissionCell,
+};
+
+export const DefaultStory = (args) => <PermissionCell {...args} />;
+
+DefaultStory.storyName = 'Default';
+
+DefaultStory.args = {
+  title: 'Access the Ethereum provider.',
+  description:
+    'Allow the snap to communicate with MetaMask direct…blockchain and suggest messages and transactions.',
+  weight: 1,
+  avatarIcon: 'ethereum',
+  dateApproved: 1680185432326,
+  revoked: false,
+};
diff --git a/ui/components/app/permission-cell/permission-cell.test.js b/ui/components/app/permission-cell/permission-cell.test.js
new file mode 100644
index 000000000..f4567827f
--- /dev/null
+++ b/ui/components/app/permission-cell/permission-cell.test.js
@@ -0,0 +1,69 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/jest';
+import PermissionCell from './permission-cell';
+
+describe('Permission Cell', () => {
+  const mockPermissionData = {
+    label: 'Access the Ethereum provider.',
+    description:
+      'Allow the snap to communicate with MetaMask direct…blockchain and suggest messages and transactions.',
+    weight: 1,
+    leftIcon: 'ethereum',
+    permissionValue: {
+      date: 1680185432326,
+    },
+    permissionName: 'ethereum-provider',
+  };
+
+  it('renders approved permission cell', () => {
+    renderWithProvider(
+      <PermissionCell
+        title={mockPermissionData.label}
+        description={mockPermissionData.description}
+        weight={mockPermissionData.weight}
+        avatarIcon={mockPermissionData.leftIcon}
+        dateApproved={mockPermissionData?.permissionValue?.date}
+        key={`${mockPermissionData.permissionName}-${1}`}
+      />,
+    );
+    expect(
+      screen.getByText('Access the Ethereum provider.'),
+    ).toBeInTheDocument();
+    expect(screen.getByText('Approved on 2023-03-30')).toBeInTheDocument();
+  });
+
+  it('renders revoked permission cell', () => {
+    renderWithProvider(
+      <PermissionCell
+        title={mockPermissionData.label}
+        description={mockPermissionData.description}
+        weight={mockPermissionData.weight}
+        avatarIcon={mockPermissionData.leftIcon}
+        dateApproved={mockPermissionData?.permissionValue?.date}
+        key={`${mockPermissionData.permissionName}-${1}`}
+        revoked
+      />,
+    );
+    expect(
+      screen.getByText('Access the Ethereum provider.'),
+    ).toBeInTheDocument();
+    expect(screen.getByText('Revoked in this update')).toBeInTheDocument();
+  });
+
+  it('renders requested permission cell', () => {
+    renderWithProvider(
+      <PermissionCell
+        title={mockPermissionData.label}
+        description={mockPermissionData.description}
+        weight={mockPermissionData.weight}
+        avatarIcon={mockPermissionData.leftIcon}
+        key={`${mockPermissionData.permissionName}-${1}`}
+      />,
+    );
+    expect(
+      screen.getByText('Access the Ethereum provider.'),
+    ).toBeInTheDocument();
+    expect(screen.getByText('Requested now')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js b/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js
index 99b554ec5..9e43d0b9d 100644
--- a/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js
+++ b/ui/components/app/permissions-connect-permission-list/permissions-connect-permission-list.js
@@ -1,37 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {
-  getRightIcon,
-  getWeightedPermissions,
-} from '../../../helpers/utils/permission';
+import { getWeightedPermissions } from '../../../helpers/utils/permission';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-
-/**
- * Get one or more permission descriptions for a permission name.
- *
- * @param permission - The permission to render.
- * @param index - The index of the permission.
- * @returns {JSX.Element} A permission description node.
- */
-function getDescriptionNode(permission, index) {
-  const { label, leftIcon, permissionName } = permission;
-
-  return (
-    <div className="permission" key={`${permissionName}-${index}`}>
-      {typeof leftIcon === 'string' ? <i className={leftIcon} /> : leftIcon}
-      {label}
-      {getRightIcon(permission)}
-    </div>
-  );
-}
+import PermissionCell from '../permission-cell';
+import Box from '../../ui/box';
 
 export default function PermissionsConnectPermissionList({ permissions }) {
   const t = useI18nContext();
 
   return (
-    <div className="permissions-connect-permission-list">
-      {getWeightedPermissions(t, permissions).map(getDescriptionNode)}
-    </div>
+    <Box paddingTop={2} paddingBottom={2}>
+      {getWeightedPermissions(t, permissions).map((permission, index) => {
+        return (
+          <PermissionCell
+            title={permission.label}
+            description={permission.description}
+            weight={permission.weight}
+            avatarIcon={permission.leftIcon}
+            dateApproved={permission?.permissionValue?.date}
+            key={`${permission.permissionName}-${index}`}
+          />
+        );
+      })}
+    </Box>
   );
 }
 
diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js
index 6987b1d7f..2d54064aa 100644
--- a/ui/helpers/utils/permission.js
+++ b/ui/helpers/utils/permission.js
@@ -15,21 +15,13 @@ import {
 } from '../../../shared/constants/permissions';
 import Tooltip from '../../components/ui/tooltip';
 import {
-  AvatarIcon,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  Icon,
   Text,
   ///: END:ONLY_INCLUDE_IN
   ICON_NAMES,
-  ICON_SIZES,
 } from '../../components/component-library';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
-import {
-  IconColor,
-  Color,
-  FONT_WEIGHT,
-  TextVariant,
-} from '../constants/design-system';
+import { Color, FONT_WEIGHT, TextVariant } from '../constants/design-system';
 import {
   coinTypeToProtocolName,
   getSnapDerivationPathName,
@@ -39,63 +31,29 @@ import {
 
 const UNKNOWN_PERMISSION = Symbol('unknown');
 
-///: BEGIN:ONLY_INCLUDE_IN(flask)
-const RIGHT_WARNING_ICON = (
-  <Icon
-    name={ICON_NAMES.DANGER}
-    size={ICON_SIZES.SM}
-    color={IconColor.warningDefault}
-  />
-);
-
-const RIGHT_INFO_ICON = (
-  <Icon
-    name={ICON_NAMES.INFO}
-    size={ICON_SIZES.SM}
-    color={IconColor.iconMuted}
-  />
-);
-///: END:ONLY_INCLUDE_IN
-
-function getLeftIcon(iconName) {
-  return (
-    <AvatarIcon
-      iconName={iconName}
-      size={ICON_SIZES.SM}
-      iconProps={{
-        size: ICON_SIZES.XS,
-      }}
-    />
-  );
-}
-
 export const PERMISSION_DESCRIPTIONS = deepFreeze({
   [RestrictedMethods.eth_accounts]: ({ t }) => ({
     label: t('permission_ethereumAccounts'),
-    leftIcon: getLeftIcon(ICON_NAMES.EYE),
-    rightIcon: null,
+    leftIcon: ICON_NAMES.EYE,
     weight: 2,
   }),
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   [RestrictedMethods.snap_confirm]: ({ t }) => ({
     label: t('permission_customConfirmation'),
     description: t('permission_customConfirmationDescription'),
-    leftIcon: getLeftIcon(ICON_NAMES.SECURITY_TICK),
-    rightIcon: RIGHT_INFO_ICON,
+    leftIcon: ICON_NAMES.SECURITY_TICK,
     weight: 3,
   }),
   [RestrictedMethods.snap_dialog]: ({ t }) => ({
     label: t('permission_dialog'),
     description: t('permission_dialogDescription'),
-    leftIcon: getLeftIcon(ICON_NAMES.MESSAGES),
-    rightIcon: RIGHT_INFO_ICON,
+    leftIcon: ICON_NAMES.MESSAGES,
     weight: 3,
   }),
   [RestrictedMethods.snap_notify]: ({ t }) => ({
     label: t('permission_notifications'),
     description: t('permission_notificationsDescription'),
-    leftIcon: getLeftIcon(ICON_NAMES.NOTIFICATION),
-    rightIcon: RIGHT_INFO_ICON,
+    leftIcon: ICON_NAMES.NOTIFICATION,
     weight: 3,
   }),
   [RestrictedMethods.snap_getBip32PublicKey]: ({
@@ -105,8 +63,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   }) =>
     permissionValue.caveats[0].value.map(({ path, curve }, i) => {
       const baseDescription = {
-        leftIcon: getLeftIcon(ICON_NAMES.SECURITY_SEARCH),
-        rightIcon: RIGHT_WARNING_ICON,
+        leftIcon: ICON_NAMES.SECURITY_SEARCH,
         weight: 1,
         id: `public-key-access-bip32-${path
           .join('-')
@@ -176,8 +133,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   }) =>
     permissionValue.caveats[0].value.map(({ path, curve }, i) => {
       const baseDescription = {
-        leftIcon: getLeftIcon(ICON_NAMES.KEY),
-        rightIcon: RIGHT_WARNING_ICON,
+        leftIcon: ICON_NAMES.KEY,
         weight: 1,
         id: `key-access-bip32-${path
           .join('-')
@@ -261,8 +217,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
             t('unrecognizedProtocol', [coinType])}
         </span>,
       ]),
-      leftIcon: getLeftIcon(ICON_NAMES.KEY),
-      rightIcon: RIGHT_WARNING_ICON,
+      leftIcon: ICON_NAMES.KEY,
       weight: 1,
       id: `key-access-bip44-${coinType}-${i}`,
       message: t('snapInstallWarningKeyAccess', [
@@ -284,22 +239,19 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   [RestrictedMethods.snap_getEntropy]: ({ t }) => ({
     label: t('permission_getEntropy'),
     description: t('permission_getEntropyDescription'),
-    leftIcon: getLeftIcon(ICON_NAMES.SECURITY_KEY),
-    rightIcon: RIGHT_INFO_ICON,
+    leftIcon: ICON_NAMES.SECURITY_KEY,
     weight: 3,
   }),
   [RestrictedMethods.snap_manageState]: ({ t }) => ({
     label: t('permission_manageState'),
     description: t('permission_manageStateDescription'),
-    leftIcon: getLeftIcon(ICON_NAMES.ADD_SQUARE),
-    rightIcon: RIGHT_INFO_ICON,
+    leftIcon: ICON_NAMES.ADD_SQUARE,
     weight: 3,
   }),
   [RestrictedMethods.wallet_snap]: ({ t, permissionValue }) => {
     const snaps = permissionValue.caveats[0].value;
     const baseDescription = {
-      leftIcon: getLeftIcon(ICON_NAMES.FLASH),
-      rightIcon: RIGHT_INFO_ICON,
+      leftIcon: ICON_NAMES.FLASH,
     };
 
     return Object.keys(snaps).map((snapId) => {
@@ -326,8 +278,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   [EndowmentPermissions['endowment:network-access']]: ({ t }) => ({
     label: t('permission_accessNetwork'),
     description: t('permission_accessNetworkDescription'),
-    leftIcon: getLeftIcon(ICON_NAMES.GLOBAL),
-    rightIcon: RIGHT_INFO_ICON,
+    leftIcon: ICON_NAMES.GLOBAL,
     weight: 2,
   }),
   [EndowmentPermissions['endowment:webassembly']]: ({ t }) => ({
@@ -340,8 +291,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   [EndowmentPermissions['endowment:long-running']]: ({ t }) => ({
     label: t('permission_longRunning'),
     description: t('permission_longRunningDescription'),
-    leftIcon: getLeftIcon(ICON_NAMES.LINK),
-    rightIcon: RIGHT_INFO_ICON,
+    leftIcon: ICON_NAMES.LINK,
     weight: 3,
   }),
   [EndowmentPermissions['endowment:transaction-insight']]: ({
@@ -349,8 +299,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
     permissionValue,
   }) => {
     const baseDescription = {
-      leftIcon: getLeftIcon(ICON_NAMES.SPEEDOMETER),
-      rightIcon: RIGHT_INFO_ICON,
+      leftIcon: ICON_NAMES.SPEEDOMETER,
       weight: 3,
     };
 
@@ -371,7 +320,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
         ...baseDescription,
         label: t('permission_transactionInsightOrigin'),
         description: t('permission_transactionInsightOriginDescription'),
-        leftIcon: getLeftIcon(ICON_NAMES.EXPLORE),
+        leftIcon: ICON_NAMES.EXPLORE,
       });
     }
 
@@ -380,8 +329,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   [EndowmentPermissions['endowment:cronjob']]: ({ t }) => ({
     label: t('permission_cronjob'),
     description: t('permission_cronjobDescription'),
-    leftIcon: getLeftIcon(ICON_NAMES.CLOCK),
-    rightIcon: RIGHT_INFO_ICON,
+    leftIcon: ICON_NAMES.CLOCK,
     weight: 2,
   }),
   [EndowmentPermissions['endowment:ethereum-provider']]: ({
@@ -390,16 +338,14 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   }) => ({
     label: t('permission_ethereumProvider'),
     description: t('permission_ethereumProviderDescription'),
-    leftIcon: getLeftIcon(ICON_NAMES.ETHEREUM),
-    rightIcon: RIGHT_INFO_ICON,
+    leftIcon: ICON_NAMES.ETHEREUM,
     weight: 1,
     id: 'ethereum-provider-access',
     message: t('ethereumProviderAccess', [targetSubjectMetadata?.origin]),
   }),
   [EndowmentPermissions['endowment:rpc']]: ({ t, permissionValue }) => {
     const baseDescription = {
-      leftIcon: getLeftIcon(ICON_NAMES.HIERARCHY),
-      rightIcon: RIGHT_INFO_ICON,
+      leftIcon: ICON_NAMES.HIERARCHY,
       weight: 2,
     };
 
@@ -427,8 +373,7 @@ export const PERMISSION_DESCRIPTIONS = deepFreeze({
   ///: END:ONLY_INCLUDE_IN
   [UNKNOWN_PERMISSION]: ({ t, permissionName }) => ({
     label: t('permission_unknown', [permissionName ?? 'undefined']),
-    leftIcon: getLeftIcon(ICON_NAMES.QUESTION),
-    rightIcon: null,
+    leftIcon: ICON_NAMES.QUESTION,
     weight: 4,
   }),
 });
diff --git a/ui/pages/permissions-connect/flask/snap-install/index.scss b/ui/pages/permissions-connect/flask/snap-install/index.scss
index dc725ce10..654653ab9 100644
--- a/ui/pages/permissions-connect/flask/snap-install/index.scss
+++ b/ui/pages/permissions-connect/flask/snap-install/index.scss
@@ -4,14 +4,6 @@
   .headers {
     flex: 1;
 
-    .permissions-connect-permission-list {
-      padding: 0 24px;
-
-      .permission {
-        padding: 8px 0;
-      }
-    }
-
     .loader-container {
       height: 100%;
     }
@@ -21,7 +13,6 @@
     }
   }
 
-
   .page-container__footer {
     width: 100%;
     margin-top: 12px;
diff --git a/ui/pages/settings/flask/view-snap/view-snap.js b/ui/pages/settings/flask/view-snap/view-snap.js
index 42ac59c8c..d8f5b6e93 100644
--- a/ui/pages/settings/flask/view-snap/view-snap.js
+++ b/ui/pages/settings/flask/view-snap/view-snap.js
@@ -13,6 +13,7 @@ import {
   TEXT_ALIGN,
   FRACTIONS,
   TextColor,
+  BLOCK_SIZES,
 } from '../../../../helpers/constants/design-system';
 import SnapAuthorship from '../../../../components/app/flask/snap-authorship';
 import Box from '../../../../components/ui/box';
@@ -176,7 +177,7 @@ function ViewSnap() {
             >
               {t('snapAccess', [snap.manifest.proposedName])}
             </Typography>
-            <Box width={FRACTIONS.TEN_TWELFTHS}>
+            <Box width={BLOCK_SIZES.FULL}>
               <PermissionsConnectPermissionList
                 permissions={permissions ?? {}}
               />

From 01057f9824b1fef3e347557b0cee361aba4debd1 Mon Sep 17 00:00:00 2001
From: Garrett Bear <gwhisten@gmail.com>
Date: Mon, 3 Apr 2023 10:42:37 -0700
Subject: [PATCH 124/129] convert text component to TS (#18329)

* convert text component to TS

* invisible character fix

* storybook fix

* fix types export

* update ButtonBase

* add typeof to objects in TextProps

* fix linting issues

* fix implicit conversion

* lint fix

* add deprecated Text back

* change box ref to any

* fix classnames issue

* account details to use deprecated text reference

* ref update

* make RefObject

* remove RefObject and go back to Ref

* react.ref change to box
---
 .../component-library/button-base/README.mdx  |   4 +-
 .../button-base/button-base.stories.js        |   4 +-
 ui/components/component-library/index.js      |   2 +-
 .../component-library/text/README.mdx         |  16 +-
 .../{text.test.js.snap => text.test.tsx.snap} |   0
 .../__snapshots__/text.test.js.snap           |  56 ++++
 .../text/{ => deprecated}/index.js            |   0
 .../text/{ => deprecated}/text.constants.js   |   0
 .../text/{ => deprecated}/text.js             |   4 +-
 .../text/{ => deprecated}/text.test.js        |   2 +-
 ui/components/component-library/text/index.ts |   3 +
 .../{text.stories.js => text.stories.tsx}     | 157 +++--------
 .../component-library/text/text.test.tsx      | 243 ++++++++++++++++++
 ui/components/component-library/text/text.tsx |  84 ++++++
 .../component-library/text/text.types.ts      | 114 ++++++++
 ui/components/ui/box/box.d.ts                 |   2 +-
 ui/helpers/utils/accounts.js                  |   2 +-
 17 files changed, 556 insertions(+), 137 deletions(-)
 rename ui/components/component-library/text/__snapshots__/{text.test.js.snap => text.test.tsx.snap} (100%)
 create mode 100644 ui/components/component-library/text/deprecated/__snapshots__/text.test.js.snap
 rename ui/components/component-library/text/{ => deprecated}/index.js (100%)
 rename ui/components/component-library/text/{ => deprecated}/text.constants.js (100%)
 rename ui/components/component-library/text/{ => deprecated}/text.js (98%)
 rename ui/components/component-library/text/{ => deprecated}/text.test.js (99%)
 create mode 100644 ui/components/component-library/text/index.ts
 rename ui/components/component-library/text/{text.stories.js => text.stories.tsx} (54%)
 create mode 100644 ui/components/component-library/text/text.test.tsx
 create mode 100644 ui/components/component-library/text/text.tsx
 create mode 100644 ui/components/component-library/text/text.types.ts

diff --git a/ui/components/component-library/button-base/README.mdx b/ui/components/component-library/button-base/README.mdx
index f18d98636..00098b473 100644
--- a/ui/components/component-library/button-base/README.mdx
+++ b/ui/components/component-library/button-base/README.mdx
@@ -177,7 +177,7 @@ For RTL language support use the `textDirection` prop.
 </Canvas>
 
 ```jsx
-import { ButtonBase, ICON_NAMES } from '../../component-library';
+import { ButtonBase, ICON_NAMES, TextDirection } from '../../component-library';
 
 <>
   <ButtonBase
@@ -189,7 +189,7 @@ import { ButtonBase, ICON_NAMES } from '../../component-library';
   <ButtonBase
     startIconName={ICON_NAMES.ADD_SQUARE}
     endIconName={ICON_NAMES.ARROW_2_RIGHT}
-    textDirection={TEXT_DIRECTIONS.RIGHT_TO_LEFT}
+    textDirection={TextDirection.RightToLeft}
   >
     Button Demo
   </ButtonBase>
diff --git a/ui/components/component-library/button-base/button-base.stories.js b/ui/components/component-library/button-base/button-base.stories.js
index 0a4afed2c..94db0c02a 100644
--- a/ui/components/component-library/button-base/button-base.stories.js
+++ b/ui/components/component-library/button-base/button-base.stories.js
@@ -7,7 +7,7 @@ import {
   Size,
 } from '../../../helpers/constants/design-system';
 import Box from '../../ui/box/box';
-import { ICON_NAMES, TEXT_DIRECTIONS } from '..';
+import { ICON_NAMES, TextDirection } from '..';
 import { BUTTON_BASE_SIZES } from './button-base.constants';
 import { ButtonBase } from './button-base';
 import README from './README.mdx';
@@ -200,7 +200,7 @@ export const Rtl = (args) => (
       {...args}
       startIconName={ICON_NAMES.ADD_SQUARE}
       endIconName={ICON_NAMES.ARROW_2_RIGHT}
-      textDirection={TEXT_DIRECTIONS.RIGHT_TO_LEFT}
+      textDirection={TextDirection.RightToLeft}
     >
       Button Demo
     </ButtonBase>
diff --git a/ui/components/component-library/index.js b/ui/components/component-library/index.js
index f24721433..f9ad8d34b 100644
--- a/ui/components/component-library/index.js
+++ b/ui/components/component-library/index.js
@@ -28,7 +28,7 @@ export { Label } from './label';
 export { PickerNetwork } from './picker-network';
 export { Tag } from './tag';
 export { TagUrl } from './tag-url';
-export { Text, TEXT_DIRECTIONS, INVISIBLE_CHARACTER } from './text';
+export { Text, ValidTag, TextDirection, InvisibleCharacter } from './text';
 export { Input, INPUT_TYPES } from './input';
 export { TextField, TEXT_FIELD_TYPES, TEXT_FIELD_SIZES } from './text-field';
 export { TextFieldSearch } from './text-field-search';
diff --git a/ui/components/component-library/text/README.mdx b/ui/components/component-library/text/README.mdx
index ea3e585a9..9af0cf1b8 100644
--- a/ui/components/component-library/text/README.mdx
+++ b/ui/components/component-library/text/README.mdx
@@ -59,7 +59,7 @@ import { TextVariant } from '../../../helpers/constants/design-system';
 
 ### Color
 
-Use the `color` prop and the `TextColor` object from `./ui/helpers/constants/design-system.js` to change the color of the `Text` component.
+Use the `color` prop and the `TextColor` enum from `./ui/helpers/constants/design-system.js` to change the color of the `Text` component.
 
 <Canvas>
   <Story id="components-componentlibrary-text--color-story" />
@@ -267,6 +267,8 @@ import { Text } from '../../component-library';
 
 Use the `as` prop to change the root html element of the `Text` component
 
+You can also utilize the `ValidTag` enum from `./text.types` to ensure that you are using a valid html element
+
 <Canvas>
   <Story id="components-componentlibrary-text--as" />
 </Canvas>
@@ -313,22 +315,22 @@ Renders the html:
 
 ### Text Direction
 
-Use the `textDirection` prop and the `TEXT_DIRECTIONS` object from `./text.constants.js` to change the text direction of `Text`
+Use the `textDirection` prop and the `TextDirection` enum from `./text.types` to change the text direction of `Text`
 
 <Canvas>
-  <Story id="components-componentlibrary-text--text-direction" />
+  <Story id="components-componentlibrary-text--text-direction-story" />
 </Canvas>
 
 ```jsx
-import { Text, TEXT_DIRECTIONS } from '../../component-library';
+import { Text, TextDirection } from '../../component-library';
 
-<Text textDirection={TEXT_DIRECTIONS.LEFT_TO_RIGHT}>
+<Text textDirection={TextDirection.LeftToRight}>
   This is left to right (ltr) for English and most languages
 </Text>
-<Text textDirection={TEXT_DIRECTIONS.RIGHT_TO_LEFT}>
+<Text textDirection={TextDirection.RightToLeft}>
   This is right to left (rtl) for use with other laguanges such as Arabic. This Enlgish example is incorrect usage.
 </Text>
-<Text textDirection={TEXT_DIRECTIONS.AUTO}>
+<Text textDirection={TextDirection.Auto}>
   Let the user agent decide with the auto option
 </Text>
 ```
diff --git a/ui/components/component-library/text/__snapshots__/text.test.js.snap b/ui/components/component-library/text/__snapshots__/text.test.tsx.snap
similarity index 100%
rename from ui/components/component-library/text/__snapshots__/text.test.js.snap
rename to ui/components/component-library/text/__snapshots__/text.test.tsx.snap
diff --git a/ui/components/component-library/text/deprecated/__snapshots__/text.test.js.snap b/ui/components/component-library/text/deprecated/__snapshots__/text.test.js.snap
new file mode 100644
index 000000000..f9c068518
--- /dev/null
+++ b/ui/components/component-library/text/deprecated/__snapshots__/text.test.js.snap
@@ -0,0 +1,56 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Text should render the Text with proper variant class name 1`] = `
+<div>
+  <h1
+    class="box mm-text mm-text--display-md box--flex-direction-row box--color-text-default"
+  >
+    display-md
+  </h1>
+  <h2
+    class="box mm-text mm-text--heading-lg box--flex-direction-row box--color-text-default"
+  >
+    heading-lg
+  </h2>
+  <h3
+    class="box mm-text mm-text--heading-md box--flex-direction-row box--color-text-default"
+  >
+    heading-md
+  </h3>
+  <h4
+    class="box mm-text mm-text--heading-sm box--flex-direction-row box--color-text-default"
+  >
+    heading-sm
+  </h4>
+  <p
+    class="box mm-text mm-text--body-lg-medium box--flex-direction-row box--color-text-default"
+  >
+    body-lg-medium
+  </p>
+  <p
+    class="box mm-text mm-text--body-md box--flex-direction-row box--color-text-default"
+  >
+    body-md
+  </p>
+  <p
+    class="box mm-text mm-text--body-md-bold box--flex-direction-row box--color-text-default"
+  >
+    body-md-bold
+  </p>
+  <p
+    class="box mm-text mm-text--body-sm box--flex-direction-row box--color-text-default"
+  >
+    body-sm
+  </p>
+  <p
+    class="box mm-text mm-text--body-sm-bold box--flex-direction-row box--color-text-default"
+  >
+    body-sm-bold
+  </p>
+  <p
+    class="box mm-text mm-text--body-xs box--flex-direction-row box--color-text-default"
+  >
+    body-xs
+  </p>
+</div>
+`;
diff --git a/ui/components/component-library/text/index.js b/ui/components/component-library/text/deprecated/index.js
similarity index 100%
rename from ui/components/component-library/text/index.js
rename to ui/components/component-library/text/deprecated/index.js
diff --git a/ui/components/component-library/text/text.constants.js b/ui/components/component-library/text/deprecated/text.constants.js
similarity index 100%
rename from ui/components/component-library/text/text.constants.js
rename to ui/components/component-library/text/deprecated/text.constants.js
diff --git a/ui/components/component-library/text/text.js b/ui/components/component-library/text/deprecated/text.js
similarity index 98%
rename from ui/components/component-library/text/text.js
rename to ui/components/component-library/text/deprecated/text.js
index 6144d3ea0..e7e0dc299 100644
--- a/ui/components/component-library/text/text.js
+++ b/ui/components/component-library/text/deprecated/text.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import Box from '../../ui/box';
+import Box from '../../../ui/box';
 import {
   FONT_WEIGHT,
   FONT_STYLE,
@@ -10,7 +10,7 @@ import {
   TEXT_TRANSFORM,
   OVERFLOW_WRAP,
   TextColor,
-} from '../../../helpers/constants/design-system';
+} from '../../../../helpers/constants/design-system';
 import { TEXT_DIRECTIONS } from './text.constants';
 
 export const ValidTags = [
diff --git a/ui/components/component-library/text/text.test.js b/ui/components/component-library/text/deprecated/text.test.js
similarity index 99%
rename from ui/components/component-library/text/text.test.js
rename to ui/components/component-library/text/deprecated/text.test.js
index a1289a436..b600bf36b 100644
--- a/ui/components/component-library/text/text.test.js
+++ b/ui/components/component-library/text/deprecated/text.test.js
@@ -9,7 +9,7 @@ import {
   TEXT_TRANSFORM,
   TextVariant,
   Color,
-} from '../../../helpers/constants/design-system';
+} from '../../../../helpers/constants/design-system';
 import { Text, TEXT_DIRECTIONS } from '.';
 
 describe('Text', () => {
diff --git a/ui/components/component-library/text/index.ts b/ui/components/component-library/text/index.ts
new file mode 100644
index 000000000..296bfc212
--- /dev/null
+++ b/ui/components/component-library/text/index.ts
@@ -0,0 +1,3 @@
+export { Text } from './text';
+export { ValidTag, TextDirection, InvisibleCharacter } from './text.types';
+export type { TextProps } from './text.types';
diff --git a/ui/components/component-library/text/text.stories.js b/ui/components/component-library/text/text.stories.tsx
similarity index 54%
rename from ui/components/component-library/text/text.stories.js
rename to ui/components/component-library/text/text.stories.tsx
index 3d28c829a..be82bdb2a 100644
--- a/ui/components/component-library/text/text.stories.js
+++ b/ui/components/component-library/text/text.stories.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { ComponentStory, ComponentMeta } from '@storybook/react';
 import {
   DISPLAY,
   BackgroundColor,
@@ -16,115 +17,20 @@ import {
 } from '../../../helpers/constants/design-system';
 
 import Box from '../../ui/box';
-import { ValidTags, Text } from './text';
-import { TEXT_DIRECTIONS } from './text.constants';
-
 import README from './README.mdx';
-
-const sizeKnobOptions = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
-const marginSizeKnobOptions = [...sizeKnobOptions, 'auto'];
+import { Text } from './text';
+import { ValidTag, TextDirection } from './text.types';
 
 export default {
   title: 'Components/ComponentLibrary/Text',
+  component: Text,
 
   parameters: {
     docs: {
       page: README,
     },
   },
-  argTypes: {
-    variant: {
-      control: { type: 'select' },
-      options: Object.values(TextVariant),
-    },
-    color: {
-      control: { type: 'select' },
-      options: Object.values(TextColor),
-    },
-    fontWeight: {
-      control: { type: 'select' },
-      options: Object.values(FONT_WEIGHT),
-    },
-    fontStyle: {
-      control: { type: 'select' },
-      options: Object.values(FONT_STYLE),
-    },
-    textTransform: {
-      control: { type: 'select' },
-      options: Object.values(TEXT_TRANSFORM),
-    },
-    align: {
-      control: { type: 'select' },
-      options: Object.values(TEXT_ALIGN),
-    },
-    overflowWrap: {
-      control: { type: 'select' },
-      options: Object.values(OVERFLOW_WRAP),
-    },
-    ellipsis: {
-      control: { type: 'boolean' },
-    },
-    as: {
-      control: { type: 'select' },
-      options: ValidTags,
-    },
-    textDirection: {
-      control: { type: 'select' },
-      options: Object.values(TEXT_DIRECTIONS),
-    },
-    className: {
-      control: { type: 'text' },
-    },
-    children: {
-      control: { type: 'text' },
-    },
-    display: {
-      options: Object.values(DISPLAY),
-      control: 'select',
-      table: { category: 'box props' },
-    },
-    backgroundColor: {
-      options: Object.values(BackgroundColor),
-      control: 'select',
-      table: { category: 'box props' },
-    },
-    borderColor: {
-      options: Object.values(BorderColor),
-      control: 'select',
-      table: { category: 'box props' },
-    },
-    padding: {
-      options: sizeKnobOptions,
-      control: 'select',
-      table: { category: 'box props' },
-    },
-    margin: {
-      options: marginSizeKnobOptions,
-      control: 'select',
-      table: { category: 'box props' },
-    },
-    marginTop: {
-      options: marginSizeKnobOptions,
-      control: 'select',
-      table: { category: 'box props' },
-    },
-    marginRight: {
-      options: marginSizeKnobOptions,
-      control: 'select',
-      table: { category: 'box props' },
-    },
-    marginBottom: {
-      options: marginSizeKnobOptions,
-      control: 'select',
-      table: { category: 'box props' },
-    },
-    marginLeft: {
-      options: marginSizeKnobOptions,
-      control: 'select',
-      table: { category: 'box props' },
-    },
-  },
-};
+} as ComponentMeta<typeof Text>;
 
 function renderBackgroundColor(color) {
   let bgColor;
@@ -164,14 +70,18 @@ function renderBackgroundColor(color) {
   return bgColor;
 }
 
-export const DefaultStory = (args) => <Text {...args}>{args.children}</Text>;
+const Template: ComponentStory<typeof Text> = (args) => (
+  <Text {...args}>{args.children}</Text>
+);
 
-DefaultStory.storyName = 'Default';
+export const DefaultStory = Template.bind({});
 
 DefaultStory.args = {
   children: 'The quick orange fox jumped over the lazy dog.',
 };
 
+DefaultStory.storyName = 'Default';
+
 export const Variant = (args) => (
   <>
     {Object.values(TextVariant).map((variant) => (
@@ -182,7 +92,7 @@ export const Variant = (args) => (
   </>
 );
 
-export const ColorStory = (args) => {
+export const ColorStory: ComponentStory<typeof Text> = (args) => {
   // Index of last valid color in TextColor array
   return (
     <>
@@ -203,7 +113,7 @@ export const ColorStory = (args) => {
 };
 ColorStory.storyName = 'Color';
 
-export const FontWeight = (args) => (
+export const FontWeight: ComponentStory<typeof Text> = (args) => (
   <>
     {Object.values(FONT_WEIGHT).map((weight) => (
       <Text {...args} fontWeight={weight} key={weight}>
@@ -213,7 +123,7 @@ export const FontWeight = (args) => (
   </>
 );
 
-export const FontStyle = (args) => (
+export const FontStyle: ComponentStory<typeof Text> = (args) => (
   <>
     {Object.values(FONT_STYLE).map((style) => (
       <Text {...args} fontStyle={style} key={style}>
@@ -223,7 +133,7 @@ export const FontStyle = (args) => (
   </>
 );
 
-export const TextTransform = (args) => (
+export const TextTransform: ComponentStory<typeof Text> = (args) => (
   <>
     {Object.values(TEXT_TRANSFORM).map((transform) => (
       <Text {...args} textTransform={transform} key={transform}>
@@ -233,7 +143,7 @@ export const TextTransform = (args) => (
   </>
 );
 
-export const TextAlign = (args) => (
+export const TextAlign: ComponentStory<typeof Text> = (args) => (
   <>
     {Object.values(TEXT_ALIGN).map((align) => (
       <Text {...args} textAlign={align} key={align}>
@@ -243,11 +153,11 @@ export const TextAlign = (args) => (
   </>
 );
 
-export const OverflowWrap = (args) => (
+export const OverflowWrap: ComponentStory<typeof Text> = (args) => (
   <Box
     borderColor={BorderColor.warningDefault}
     display={DISPLAY.BLOCK}
-    width={FRACTIONS.ONE_THIRD}
+    style={{ width: 200 }}
   >
     <Text {...args} overflowWrap={OVERFLOW_WRAP.NORMAL}>
       {OVERFLOW_WRAP.NORMAL}: 0x39013f961c378f02c2b82a6e1d31e9812786fd9d
@@ -258,7 +168,7 @@ export const OverflowWrap = (args) => (
   </Box>
 );
 
-export const Ellipsis = (args) => (
+export const Ellipsis: ComponentStory<typeof Text> = (args) => (
   <Box
     borderColor={BorderColor.primaryDefault}
     display={DISPLAY.BLOCK}
@@ -273,16 +183,23 @@ export const Ellipsis = (args) => (
   </Box>
 );
 
-export const As = (args) => (
+export const As: ComponentStory<typeof Text> = (args) => (
   <>
-    {ValidTags.map((tag) => {
-      if (tag === 'input') {
-        return <Text key={tag} {...args} as={tag} placeholder={tag} />;
+    {Object.keys(ValidTag).map((tag) => {
+      if (ValidTag[tag] === ValidTag.Input) {
+        return (
+          <Text
+            key={ValidTag[tag]}
+            {...args}
+            as={ValidTag[tag]}
+            placeholder={ValidTag[tag]}
+          />
+        );
       }
       return (
-        <div key={tag}>
-          <Text {...args} as={tag}>
-            {tag}
+        <div key={ValidTag[tag]}>
+          <Text {...args} as={ValidTag[tag]}>
+            {ValidTag[tag]}
           </Text>
         </div>
       );
@@ -290,21 +207,21 @@ export const As = (args) => (
   </>
 );
 
-export const TextDirection = (args) => (
+export const TextDirectionStory: ComponentStory<typeof Text> = (args) => (
   <Box
     style={{ maxWidth: 300 }}
     display={DISPLAY.FLEX}
     flexDirection={FLEX_DIRECTION.COLUMN}
     gap={4}
   >
-    <Text {...args} textDirection={TEXT_DIRECTIONS.LEFT_TO_RIGHT}>
+    <Text {...args} textDirection={TextDirection.LeftToRight}>
       This is left to right (ltr) for English and most languages
     </Text>
-    <Text {...args} textDirection={TEXT_DIRECTIONS.RIGHT_TO_LEFT}>
+    <Text {...args} textDirection={TextDirection.RightToLeft}>
       This is right to left (rtl) for use with other laguanges such as Arabic.
       This Enlgish example is incorrect usage.
     </Text>
-    <Text {...args} textDirection={TEXT_DIRECTIONS.AUTO}>
+    <Text {...args} textDirection={TextDirection.Auto}>
       Let the user agent decide with the auto option
     </Text>
   </Box>
diff --git a/ui/components/component-library/text/text.test.tsx b/ui/components/component-library/text/text.test.tsx
new file mode 100644
index 000000000..8a3f28eb8
--- /dev/null
+++ b/ui/components/component-library/text/text.test.tsx
@@ -0,0 +1,243 @@
+import * as React from 'react';
+import { render } from '@testing-library/react';
+import {
+  FONT_STYLE,
+  FONT_WEIGHT,
+  OVERFLOW_WRAP,
+  TEXT_ALIGN,
+  TextColor,
+  TEXT_TRANSFORM,
+  TextVariant,
+  Color,
+} from '../../../helpers/constants/design-system';
+import { TextDirection, ValidTag } from './text.types';
+import { Text } from '.';
+
+describe('Text', () => {
+  it('should render the Text without crashing', () => {
+    const { getByText } = render(<Text>Test type</Text>);
+    expect(getByText('Test type')).toBeDefined();
+  });
+  it('should render the Text with correct html elements', () => {
+    const { getByText, container } = render(
+      <>
+        <Text as={ValidTag.P}>p</Text>
+        <Text as={ValidTag.H1}>h1</Text>
+        <Text as={ValidTag.H2}>h2</Text>
+        <Text as={ValidTag.H3}>h3</Text>
+        <Text as={ValidTag.H4}>h4</Text>
+        <Text as={ValidTag.H5}>h5</Text>
+        <Text as={ValidTag.H6}>h6</Text>
+        <Text as={ValidTag.Span}>span</Text>
+        <Text as={ValidTag.Strong}>strong</Text>
+        <Text as={ValidTag.Em}>em</Text>
+        <Text as={ValidTag.Li}>li</Text>
+        <Text as={ValidTag.Div}>div</Text>
+        <Text as={ValidTag.Dt}>dt</Text>
+        <Text as={ValidTag.Dd}>dd</Text>
+      </>,
+    );
+    expect(container.querySelector('p')).toBeDefined();
+    expect(getByText('p')).toBeDefined();
+    expect(container.querySelector('h1')).toBeDefined();
+    expect(getByText('h1')).toBeDefined();
+    expect(container.querySelector('h2')).toBeDefined();
+    expect(getByText('h2')).toBeDefined();
+    expect(container.querySelector('h3')).toBeDefined();
+    expect(getByText('h3')).toBeDefined();
+    expect(container.querySelector('h4')).toBeDefined();
+    expect(getByText('h4')).toBeDefined();
+    expect(container.querySelector('h5')).toBeDefined();
+    expect(getByText('h5')).toBeDefined();
+    expect(container.querySelector('h6')).toBeDefined();
+    expect(getByText('h6')).toBeDefined();
+    expect(container.querySelector('span')).toBeDefined();
+    expect(getByText('span')).toBeDefined();
+    expect(container.querySelector('strong')).toBeDefined();
+    expect(getByText('strong')).toBeDefined();
+    expect(container.querySelector('em')).toBeDefined();
+    expect(getByText('em')).toBeDefined();
+    expect(container.querySelector('li')).toBeDefined();
+    expect(getByText('li')).toBeDefined();
+    expect(container.querySelector('div')).toBeDefined();
+    expect(getByText('div')).toBeDefined();
+    expect(container.querySelector('dt')).toBeDefined();
+    expect(getByText('dt')).toBeDefined();
+    expect(container.querySelector('dd')).toBeDefined();
+    expect(getByText('dd')).toBeDefined();
+  });
+
+  it('should render the Text with proper variant class name', () => {
+    const { getByText, container } = render(
+      <>
+        <Text variant={TextVariant.displayMd}>display-md</Text>
+        <Text variant={TextVariant.headingLg}>heading-lg</Text>
+        <Text variant={TextVariant.headingMd}>heading-md</Text>
+        <Text variant={TextVariant.headingSm}>heading-sm</Text>
+        <Text variant={TextVariant.bodyLgMedium}>body-lg-medium</Text>
+        <Text variant={TextVariant.bodyMd}>body-md</Text>
+        <Text variant={TextVariant.bodyMdBold}>body-md-bold</Text>
+        <Text variant={TextVariant.bodySm}>body-sm</Text>
+        <Text variant={TextVariant.bodySmBold}>body-sm-bold</Text>
+        <Text variant={TextVariant.bodyXs}>body-xs</Text>
+      </>,
+    );
+
+    expect(getByText('display-md')).toHaveClass('mm-text--display-md');
+    expect(getByText('heading-lg')).toHaveClass('mm-text--heading-lg');
+    expect(getByText('heading-md')).toHaveClass('mm-text--heading-md');
+    expect(getByText('heading-sm')).toHaveClass('mm-text--heading-sm');
+    expect(getByText('body-lg-medium')).toHaveClass('mm-text--body-lg-medium');
+    expect(getByText('body-md')).toHaveClass('mm-text--body-md');
+    expect(getByText('body-md-bold')).toHaveClass('mm-text--body-md-bold');
+    expect(getByText('body-sm')).toHaveClass('mm-text--body-sm');
+    expect(getByText('body-sm-bold')).toHaveClass('mm-text--body-sm-bold');
+    expect(getByText('body-xs')).toHaveClass('mm-text--body-xs');
+    expect(container).toMatchSnapshot();
+  });
+
+  it('should render the Text with proper font weight class name', () => {
+    const { getByText } = render(
+      <>
+        <Text fontWeight={FONT_WEIGHT.BOLD}>bold</Text>
+        <Text fontWeight={FONT_WEIGHT.MEDIUM}>medium</Text>
+        <Text fontWeight={FONT_WEIGHT.NORMAL}>normal</Text>
+      </>,
+    );
+    expect(getByText('bold')).toHaveClass('mm-text--font-weight-bold');
+    expect(getByText('medium')).toHaveClass('mm-text--font-weight-medium');
+    expect(getByText('normal')).toHaveClass('mm-text--font-weight-normal');
+  });
+
+  it('should render the Text with proper text color class name', () => {
+    const { getByText } = render(
+      <>
+        <Text color={TextColor.textDefault}>text-default</Text>
+        <Text color={TextColor.textAlternative}>text-alternative</Text>
+        <Text color={TextColor.textMuted}>text-muted</Text>
+        <Text color={Color.overlayInverse}>overlay-inverse</Text>
+        <Text color={TextColor.primaryDefault}>primary-default</Text>
+        <Text color={TextColor.primaryInverse}>primary-inverse</Text>
+        <Text color={TextColor.errorDefault}>error-default</Text>
+        <Text color={TextColor.errorInverse}>error-inverse</Text>
+        <Text color={TextColor.successDefault}>success-default</Text>
+        <Text color={TextColor.successInverse}>success-inverse</Text>
+        <Text color={TextColor.warningInverse}>warning-inverse</Text>
+        <Text color={TextColor.infoDefault}>info-default</Text>
+        <Text color={TextColor.infoInverse}>info-inverse</Text>
+      </>,
+    );
+    expect(getByText('text-default')).toHaveClass('box--color-text-default');
+    expect(getByText('text-alternative')).toHaveClass(
+      'box--color-text-alternative',
+    );
+    expect(getByText('text-muted')).toHaveClass('box--color-text-muted');
+    expect(getByText('primary-default')).toHaveClass(
+      'box--color-primary-default',
+    );
+    expect(getByText('primary-inverse')).toHaveClass(
+      'box--color-primary-inverse',
+    );
+    expect(getByText('error-default')).toHaveClass('box--color-error-default');
+    expect(getByText('error-inverse')).toHaveClass('box--color-error-inverse');
+    expect(getByText('success-default')).toHaveClass(
+      'box--color-success-default',
+    );
+    expect(getByText('success-inverse')).toHaveClass(
+      'box--color-success-inverse',
+    );
+    expect(getByText('warning-inverse')).toHaveClass(
+      'box--color-warning-inverse',
+    );
+    expect(getByText('info-default')).toHaveClass('box--color-info-default');
+    expect(getByText('info-inverse')).toHaveClass('box--color-info-inverse');
+  });
+
+  it('should render the Text with proper font style class name', () => {
+    const { getByText } = render(
+      <>
+        <Text fontStyle={FONT_STYLE.ITALIC}>italic</Text>
+        <Text fontStyle={FONT_STYLE.NORMAL}>normal</Text>
+      </>,
+    );
+    expect(getByText('italic')).toHaveClass('mm-text--font-style-italic');
+    expect(getByText('normal')).toHaveClass('mm-text--font-style-normal');
+  });
+
+  it('should render the Text with proper text align class name', () => {
+    const { getByText } = render(
+      <>
+        <Text textAlign={TEXT_ALIGN.LEFT}>left</Text>
+        <Text textAlign={TEXT_ALIGN.CENTER}>center</Text>
+        <Text textAlign={TEXT_ALIGN.RIGHT}>right</Text>
+        <Text textAlign={TEXT_ALIGN.JUSTIFY}>justify</Text>
+        <Text textAlign={TEXT_ALIGN.END}>end</Text>
+      </>,
+    );
+
+    expect(getByText('left')).toHaveClass('mm-text--text-align-left');
+    expect(getByText('center')).toHaveClass('mm-text--text-align-center');
+    expect(getByText('right')).toHaveClass('mm-text--text-align-right');
+    expect(getByText('justify')).toHaveClass('mm-text--text-align-justify');
+    expect(getByText('end')).toHaveClass('mm-text--text-align-end');
+  });
+
+  it('should render the Text with proper overflow wrap class name', () => {
+    const { getByText } = render(
+      <>
+        <Text overflowWrap={OVERFLOW_WRAP.BREAK_WORD}>break-word</Text>
+        <Text overflowWrap={OVERFLOW_WRAP.NORMAL}>normal</Text>
+      </>,
+    );
+    expect(getByText('break-word')).toHaveClass(
+      'mm-text--overflow-wrap-break-word',
+    );
+    expect(getByText('normal')).toHaveClass('mm-text--overflow-wrap-normal');
+  });
+
+  it('should render the Text with proper ellipsis class name', () => {
+    const { getByText } = render(
+      <>
+        <Text ellipsis>ellipsis</Text>
+      </>,
+    );
+    expect(getByText('ellipsis')).toHaveClass('mm-text--ellipsis');
+  });
+
+  it('should render the Text with proper text transform class name', () => {
+    const { getByText } = render(
+      <>
+        <Text textTransform={TEXT_TRANSFORM.UPPERCASE}>uppercase</Text>
+        <Text textTransform={TEXT_TRANSFORM.LOWERCASE}>lowercase</Text>
+        <Text textTransform={TEXT_TRANSFORM.CAPITALIZE}>capitalize</Text>
+      </>,
+    );
+    expect(getByText('uppercase')).toHaveClass(
+      'mm-text--text-transform-uppercase',
+    );
+    expect(getByText('lowercase')).toHaveClass(
+      'mm-text--text-transform-lowercase',
+    );
+    expect(getByText('capitalize')).toHaveClass(
+      'mm-text--text-transform-capitalize',
+    );
+  });
+  it('should accept a ref prop that is passed down to the html element', () => {
+    const mockRef = jest.fn();
+    render(<Text ref={mockRef} />);
+    expect(mockRef).toHaveBeenCalledTimes(1);
+  });
+
+  it('should render the Text with proper direction', () => {
+    const { getByText } = render(
+      <>
+        <Text textDirection={TextDirection.Auto}>auto</Text>
+        <Text textDirection={TextDirection.LeftToRight}>ltr</Text>
+        <Text textDirection={TextDirection.RightToLeft}>rtl</Text>
+      </>,
+    );
+    expect(getByText('auto')).toHaveAttribute('dir', 'auto');
+    expect(getByText('ltr')).toHaveAttribute('dir', 'ltr');
+    expect(getByText('rtl')).toHaveAttribute('dir', 'rtl');
+  });
+});
diff --git a/ui/components/component-library/text/text.tsx b/ui/components/component-library/text/text.tsx
new file mode 100644
index 000000000..64f18d836
--- /dev/null
+++ b/ui/components/component-library/text/text.tsx
@@ -0,0 +1,84 @@
+import React, { forwardRef, Ref } from 'react';
+import classnames from 'classnames';
+import Box from '../../ui/box';
+import {
+  FONT_WEIGHT,
+  TextVariant,
+  TextColor,
+} from '../../../helpers/constants/design-system';
+import { TextProps, ValidTag } from './text.types';
+
+const getTextElementDefault = (variant: TextVariant) => {
+  switch (variant) {
+    case TextVariant.displayMd:
+      return ValidTag.H1;
+    case TextVariant.headingLg:
+      return ValidTag.H2;
+    case TextVariant.headingMd:
+      return ValidTag.H3;
+    case TextVariant.headingSm:
+      return ValidTag.H4;
+    case TextVariant.inherit:
+      return ValidTag.Span;
+    // TextVariant.bodyLgMedium, TextVariant.bodyMd, TextVariant.bodyMdBold, TextVariant.bodySm, TextVariant.bodySmBold, TextVariant.bodyXs use default 'p' tag
+    default:
+      return ValidTag.P;
+  }
+};
+
+export const Text = forwardRef(function Text(
+  {
+    variant = TextVariant.bodyMd,
+    color = TextColor.textDefault,
+    fontWeight,
+    fontStyle,
+    textTransform,
+    textAlign,
+    textDirection,
+    overflowWrap,
+    ellipsis,
+    as,
+    className = '',
+    children,
+    ...props
+  }: TextProps,
+  ref: Ref<HTMLElement>,
+) {
+  // Check if as is set otherwise set a default tag based on variant
+  const Tag = as ?? getTextElementDefault(variant);
+  let strongTagFontWeight;
+
+  if (Tag === 'strong') {
+    strongTagFontWeight = FONT_WEIGHT.BOLD;
+  }
+
+  const computedClassName = classnames(
+    'mm-text',
+    className,
+    `mm-text--${variant}`,
+    {
+      [`mm-text--font-weight-${strongTagFontWeight || fontWeight}`]: Boolean(
+        strongTagFontWeight || fontWeight,
+      ),
+      [`mm-text--font-style-${String(fontStyle)}`]: Boolean(fontStyle),
+      [`mm-text--ellipsis`]: Boolean(ellipsis),
+      [`mm-text--text-transform-${String(textTransform)}`]:
+        Boolean(textTransform),
+      [`mm-text--text-align-${String(textAlign)}`]: Boolean(textAlign),
+      [`mm-text--overflow-wrap-${String(overflowWrap)}`]: Boolean(overflowWrap),
+    },
+  );
+
+  return (
+    <Box
+      className={classnames(computedClassName)}
+      as={Tag}
+      dir={textDirection}
+      color={color}
+      ref={ref}
+      {...props}
+    >
+      {children}
+    </Box>
+  );
+});
diff --git a/ui/components/component-library/text/text.types.ts b/ui/components/component-library/text/text.types.ts
new file mode 100644
index 000000000..f8749db61
--- /dev/null
+++ b/ui/components/component-library/text/text.types.ts
@@ -0,0 +1,114 @@
+import React from 'react';
+import type { BoxProps } from '../../ui/box/box.d';
+import {
+  FONT_WEIGHT,
+  FONT_STYLE,
+  TextVariant,
+  TEXT_ALIGN,
+  TEXT_TRANSFORM,
+  OVERFLOW_WRAP,
+  TextColor,
+  Color,
+} from '../../../helpers/constants/design-system';
+
+export enum TextDirection {
+  LeftToRight = 'ltr',
+  RightToLeft = 'rtl',
+  Auto = 'auto',
+}
+
+/**
+ * The InvisibleCharacter is a very useful tool if you want to make sure a line of text
+ * takes up vertical space even if it's empty.
+ */
+export const InvisibleCharacter = '\u200B';
+
+export enum ValidTag {
+  Dd = 'dd',
+  Div = 'div',
+  Dt = 'dt',
+  Em = 'em',
+  H1 = 'h1',
+  H2 = 'h2',
+  H3 = 'h3',
+  H4 = 'h4',
+  H5 = 'h5',
+  H6 = 'h6',
+  Li = 'li',
+  P = 'p',
+  Span = 'span',
+  Strong = 'strong',
+  Ul = 'ul',
+  Label = 'label',
+  Input = 'input',
+}
+
+export interface TextProps extends BoxProps {
+  /**
+   * The text content of the Text component
+   */
+  children: React.ReactNode;
+  /**
+   * The variation of font styles including sizes and weights of the Text component
+   * Possible values:
+   * `displayMd` large screen: 48px / small screen: 32px,
+   * `headingLg` large screen: 32px / small screen: 24px,
+   * `headingMd` large screen: 24px / small screen: 18px,
+   * `headingSm` large screen: 18px / small screen: 16px,
+   * `bodyLgMedium` large screen: 18px / small screen: 16px,
+   * `bodyMd` large screen: 16px / small screen: 14px,
+   * `bodyMdBold` large screen: 16px / small screen: 14px,
+   * `bodySm` large screen: 14px / small screen: 12px,
+   * `bodySmBold` large screen: 14px / small screen: 12px,
+   * `bodyXs` large screen: 12px / small screen: 10px,
+   * `inherit`
+   */
+  variant?: TextVariant;
+  /**
+   * The color of the Text component Should use the COLOR object from
+   * ./ui/helpers/constants/design-system.js
+   */
+  color?: TextColor | Color;
+  /**
+   * The font-weight of the Text component. Should use the FONT_WEIGHT object from
+   * ./ui/helpers/constants/design-system.js
+   */
+  fontWeight?: keyof typeof FONT_WEIGHT;
+  /**
+   * The font-style of the Text component. Should use the FONT_STYLE object from
+   * ./ui/helpers/constants/design-system.js
+   */
+  fontStyle?: keyof typeof FONT_STYLE;
+  /**
+   * The textTransform of the Text component. Should use the TEXT_TRANSFORM object from
+   * ./ui/helpers/constants/design-system.js
+   */
+  textTransform?: keyof typeof TEXT_TRANSFORM;
+  /**
+   * The text-align of the Text component. Should use the TEXT_ALIGN object from
+   * ./ui/helpers/constants/design-system.js
+   */
+  textAlign?: keyof typeof TEXT_ALIGN;
+  /**
+   * Change the dir (direction) global attribute of text to support the direction a language is written
+   * Possible values: `LEFT_TO_RIGHT` (default), `RIGHT_TO_LEFT`, `AUTO` (user agent decides)
+   */
+  textDirection?: TextDirection;
+  /**
+   * The overflow-wrap of the Text component. Should use the OVERFLOW_WRAP object from
+   * ./ui/helpers/constants/design-system.js
+   */
+  overflowWrap?: keyof typeof OVERFLOW_WRAP;
+  /**
+   * Used for long strings that can be cut off...
+   */
+  ellipsis?: boolean;
+  /**
+   * Changes the root html element tag of the Text component.
+   */
+  as?: ValidTag;
+  /**
+   * Additional className to assign the Text component
+   */
+  className?: string;
+}
diff --git a/ui/components/ui/box/box.d.ts b/ui/components/ui/box/box.d.ts
index 4b40d37c9..bc7b397fd 100644
--- a/ui/components/ui/box/box.d.ts
+++ b/ui/components/ui/box/box.d.ts
@@ -337,7 +337,7 @@ export interface BoxProps extends React.HTMLAttributes<HTMLElement> {
   /**
    * The ref of the Box component.
    */
-  ref?: React.RefObject<HTMLElement>;
+  ref?: React.Ref<HTMLElement>;
 }
 
 declare const Box: React.FC<BoxProps>;
diff --git a/ui/helpers/utils/accounts.js b/ui/helpers/utils/accounts.js
index 102d22075..6bfa68d86 100644
--- a/ui/helpers/utils/accounts.js
+++ b/ui/helpers/utils/accounts.js
@@ -1,4 +1,4 @@
-import { INVISIBLE_CHARACTER } from '../../components/component-library';
+import { INVISIBLE_CHARACTER } from '../../components/component-library/text/deprecated';
 
 export function getAccountNameErrorMessage(
   accounts,

From 0614b3db6854f723e69fc188e82cdfb123fd3be9 Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Mon, 3 Apr 2023 23:27:14 +0530
Subject: [PATCH 125/129] UXMultichain: update segmented tabs  (#18283)

* update tabs to functional component

* updated Tabs to use Box

* updated css for tab

* updated css on home screen

* updated snapshot

* fixed defaultkey and active key value for new keys
---
 .../ui/tabs/dropdown-tab/dropdown-tab.js      |   6 +-
 ui/components/ui/tabs/index.scss              |   3 -
 ui/components/ui/tabs/tab/index.scss          |   5 -
 ui/components/ui/tabs/tab/tab.component.js    |  21 +-
 ui/components/ui/tabs/tabs.component.js       | 184 +++++++++---------
 ui/components/ui/tabs/tabs.stories.js         |  13 +-
 .../confirm-transaction-base.test.js.snap     |  24 ++-
 ui/pages/home/index.scss                      |   4 +-
 8 files changed, 138 insertions(+), 122 deletions(-)

diff --git a/ui/components/ui/tabs/dropdown-tab/dropdown-tab.js b/ui/components/ui/tabs/dropdown-tab/dropdown-tab.js
index 4deccf850..6da690afc 100644
--- a/ui/components/ui/tabs/dropdown-tab/dropdown-tab.js
+++ b/ui/components/ui/tabs/dropdown-tab/dropdown-tab.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import Dropdown from '../../dropdown';
+import Box from '../../box';
 
 export const DropdownTab = (props) => {
   const {
@@ -17,7 +18,8 @@ export const DropdownTab = (props) => {
   } = props;
 
   return (
-    <li
+    <Box
+      as="li"
       className={classnames('tab', className, {
         'tab--active': isActive,
         [activeClassName]: activeClassName && isActive,
@@ -33,7 +35,7 @@ export const DropdownTab = (props) => {
         selectedOption={selectedOption}
         onChange={onChange}
       />
-    </li>
+    </Box>
   );
 };
 
diff --git a/ui/components/ui/tabs/index.scss b/ui/components/ui/tabs/index.scss
index ccfd30548..4398ddf50 100644
--- a/ui/components/ui/tabs/index.scss
+++ b/ui/components/ui/tabs/index.scss
@@ -7,10 +7,7 @@
   -moz-transform: translateZ(0);
 
   &__list {
-    display: flex;
-    justify-content: flex-start;
     border-bottom: 1px solid var(--color-border-default);
-    background-color: var(--color-background-default);
     position: sticky;
     top: 0;
     z-index: 2;
diff --git a/ui/components/ui/tabs/tab/index.scss b/ui/components/ui/tabs/tab/index.scss
index 0fba0aea0..9ceb99941 100644
--- a/ui/components/ui/tabs/tab/index.scss
+++ b/ui/components/ui/tabs/tab/index.scss
@@ -1,11 +1,6 @@
 .tab {
   button {
-    cursor: pointer;
-    padding: 8px;
     min-width: 50px;
-    text-align: center;
-    display: block;
-    width: 100%;
     background-color: unset;
     font-size: unset;
     color: unset;
diff --git a/ui/components/ui/tabs/tab/tab.component.js b/ui/components/ui/tabs/tab/tab.component.js
index 72f1d2fe8..8aa7207d3 100644
--- a/ui/components/ui/tabs/tab/tab.component.js
+++ b/ui/components/ui/tabs/tab/tab.component.js
@@ -1,6 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
+import {
+  BLOCK_SIZES,
+  DISPLAY,
+  TEXT_ALIGN,
+} from '../../../../helpers/constants/design-system';
+import Box from '../../box';
 
 const Tab = (props) => {
   const {
@@ -15,7 +21,8 @@ const Tab = (props) => {
   } = props;
 
   return (
-    <li
+    <Box
+      as="li"
       className={classnames('tab', className, {
         'tab--active': isActive,
         [activeClassName]: activeClassName && isActive,
@@ -27,8 +34,16 @@ const Tab = (props) => {
       }}
       key={tabKey}
     >
-      <button>{name}</button>
-    </li>
+      <Box
+        as="button"
+        padding={2}
+        textAlign={TEXT_ALIGN.CENTER}
+        display={DISPLAY.BLOCK}
+        width={BLOCK_SIZES.FULL}
+      >
+        {name}
+      </Box>
+    </Box>
   );
 };
 
diff --git a/ui/components/ui/tabs/tabs.component.js b/ui/components/ui/tabs/tabs.component.js
index 47e402e3f..e96576711 100644
--- a/ui/components/ui/tabs/tabs.component.js
+++ b/ui/components/ui/tabs/tabs.component.js
@@ -1,93 +1,26 @@
-import React, { Component } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
+import Box from '../box';
+import {
+  BackgroundColor,
+  DISPLAY,
+  JustifyContent,
+} from '../../../helpers/constants/design-system';
 
-export default class Tabs extends Component {
-  static defaultProps = {
-    defaultActiveTabKey: null,
-    onTabClick: null,
-    tabsClassName: undefined,
-    subHeader: null,
+const Tabs = ({
+  defaultActiveTabKey,
+  onTabClick,
+  children,
+  tabsClassName,
+  subHeader,
+}) => {
+  // This ignores any 'null' child elements that are a result of a conditional
+  // based on a feature flag setting.
+  const _getValidChildren = () => {
+    return React.Children.toArray(children).filter(Boolean);
   };
 
-  static propTypes = {
-    defaultActiveTabKey: PropTypes.string,
-    onTabClick: PropTypes.func,
-    children: PropTypes.node.isRequired,
-    tabsClassName: PropTypes.string,
-    subHeader: PropTypes.node,
-  };
-
-  state = {
-    activeTabIndex: Math.max(
-      this._findChildByKey(this.props.defaultActiveTabKey),
-      0,
-    ),
-  };
-
-  handleTabClick(tabIndex, tabKey) {
-    const { onTabClick } = this.props;
-    const { activeTabIndex } = this.state;
-
-    if (tabIndex !== activeTabIndex) {
-      this.setState(
-        {
-          activeTabIndex: tabIndex,
-        },
-        () => {
-          if (onTabClick) {
-            onTabClick(tabKey);
-          }
-        },
-      );
-    }
-  }
-
-  renderTabs() {
-    const numberOfTabs = React.Children.count(this._getValidChildren());
-
-    return React.Children.map(this._getValidChildren(), (child, index) => {
-      const tabKey = child?.props.tabKey;
-      return (
-        child &&
-        React.cloneElement(child, {
-          onClick: (idx) => this.handleTabClick(idx, tabKey),
-          tabIndex: index,
-          isActive: numberOfTabs > 1 && index === this.state.activeTabIndex,
-        })
-      );
-    });
-  }
-
-  renderActiveTabContent() {
-    const children = this._getValidChildren();
-    const { activeTabIndex } = this.state;
-
-    if (
-      (Array.isArray(children) && !children[activeTabIndex]) ||
-      (!Array.isArray(children) && activeTabIndex !== 0)
-    ) {
-      throw new Error(`Tab at index '${activeTabIndex}' does not exist`);
-    }
-
-    return children[activeTabIndex]
-      ? children[activeTabIndex].props.children
-      : children.props.children;
-  }
-
-  render() {
-    const { tabsClassName, subHeader } = this.props;
-    return (
-      <div className="tabs">
-        <ul className={classnames('tabs__list', tabsClassName)}>
-          {this.renderTabs()}
-        </ul>
-        {subHeader}
-        <div className="tabs__content">{this.renderActiveTabContent()}</div>
-      </div>
-    );
-  }
-
   /**
    * Returns the index of the child with the given key
    *
@@ -95,15 +28,74 @@ export default class Tabs extends Component {
    * @returns {number} the index of the child with the given name
    * @private
    */
-  _findChildByKey(tabKey) {
-    return this._getValidChildren().findIndex(
-      (c) => c?.props.tabKey === tabKey,
-    );
-  }
+  const _findChildByKey = (tabKey) => {
+    return _getValidChildren().findIndex((c) => c?.props.tabKey === tabKey);
+  };
 
-  // This ignores any 'null' child elements that are a result of a conditional
-  // based on a feature flag setting.
-  _getValidChildren() {
-    return React.Children.toArray(this.props.children).filter(Boolean);
-  }
-}
+  const [activeTabIndex, setActiveTabIndex] = useState(() =>
+    Math.max(_findChildByKey(defaultActiveTabKey), 0),
+  );
+
+  const handleTabClick = (tabIndex, tabKey) => {
+    if (tabIndex !== activeTabIndex) {
+      setActiveTabIndex(tabIndex);
+      onTabClick?.(tabKey);
+    }
+  };
+
+  const renderTabs = () => {
+    const numberOfTabs = React.Children.count(_getValidChildren());
+
+    return React.Children.map(_getValidChildren(), (child, index) => {
+      const tabKey = child?.props.tabKey;
+      return (
+        child &&
+        React.cloneElement(child, {
+          onClick: (idx) => handleTabClick(idx, tabKey),
+          tabIndex: index,
+          isActive: numberOfTabs > 1 && index === activeTabIndex,
+        })
+      );
+    });
+  };
+  const renderActiveTabContent = () => {
+    const validChildren = _getValidChildren();
+
+    if (
+      (Array.isArray(validChildren) && !validChildren[activeTabIndex]) ||
+      (!Array.isArray(validChildren) && activeTabIndex !== 0)
+    ) {
+      throw new Error(`Tab at index '${activeTabIndex}' does not exist`);
+    }
+
+    return validChildren[activeTabIndex]
+      ? validChildren[activeTabIndex].props.children
+      : validChildren.props.children;
+  };
+
+  return (
+    <Box className="tabs">
+      <Box
+        as="ul"
+        display={DISPLAY.FLEX}
+        justifyContent={JustifyContent.flexStart}
+        backgroundColor={BackgroundColor.backgroundDefault}
+        className={classnames('tabs__list', tabsClassName)}
+        gap={1}
+      >
+        {renderTabs()}
+      </Box>
+      {subHeader}
+      <Box className="tabs__content">{renderActiveTabContent()}</Box>
+    </Box>
+  );
+};
+
+export default Tabs;
+Tabs.propTypes = {
+  defaultActiveTabKey: PropTypes.string,
+  onTabClick: PropTypes.func,
+  children: PropTypes.node.isRequired,
+  tabsClassName: PropTypes.string,
+  subHeader: PropTypes.node,
+};
diff --git a/ui/components/ui/tabs/tabs.stories.js b/ui/components/ui/tabs/tabs.stories.js
index 1b12d462b..d8d4c4b39 100644
--- a/ui/components/ui/tabs/tabs.stories.js
+++ b/ui/components/ui/tabs/tabs.stories.js
@@ -17,6 +17,7 @@ export default {
       },
     },
     onTabClick: { action: 'onTabClick' },
+    onChange: { action: 'onChange' },
   },
   args: {
     tabs: [
@@ -42,16 +43,24 @@ export const DefaultStory = (args) => {
       onTabClick={args.onTabClick}
     >
       {args.tabs.map((tabProps, i) => renderTab(tabProps, i, args.t))}
+    </Tabs>
+  );
+};
+
+DefaultStory.storyName = 'Default';
+
+export const DropdownStory = (args) => {
+  return (
+    <Tabs>
       <DropdownTab
         options={[
           { name: 'Insight Snap', value: 'Insight Snap' },
           { name: 'Tenderly Insight', value: 'Tenderly Insight' },
         ]}
+        onChange={args.onChange}
       >
         This is a dropdown Tab
       </DropdownTab>
     </Tabs>
   );
 };
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
index 922adf6c5..0cfbc28bb 100644
--- a/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
+++ b/ui/pages/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
@@ -278,35 +278,41 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
         </div>
       </div>
       <div
-        class="tabs"
+        class="box tabs box--flex-direction-row"
       >
         <ul
-          class="tabs__list"
+          class="box tabs__list box--display-flex box--gap-1 box--flex-direction-row box--justify-content-flex-start box--background-color-background-default"
         >
           <li
-            class="tab confirm-page-container-content__tab tab--active"
+            class="box tab confirm-page-container-content__tab tab--active box--flex-direction-row"
           >
-            <button>
+            <button
+              class="box box--padding-2 box--display-block box--flex-direction-row box--text-align-center box--width-full"
+            >
               Details
             </button>
           </li>
           <li
-            class="tab confirm-page-container-content__tab"
+            class="box tab confirm-page-container-content__tab box--flex-direction-row"
           >
-            <button>
+            <button
+              class="box box--padding-2 box--display-block box--flex-direction-row box--text-align-center box--width-full"
+            >
               Data
             </button>
           </li>
           <li
-            class="tab confirm-page-container-content__tab"
+            class="box tab confirm-page-container-content__tab box--flex-direction-row"
           >
-            <button>
+            <button
+              class="box box--padding-2 box--display-block box--flex-direction-row box--text-align-center box--width-full"
+            >
               Hex
             </button>
           </li>
         </ul>
         <div
-          class="tabs__content"
+          class="box tabs__content box--flex-direction-row"
         >
           <div
             class="confirm-page-container-content__details"
diff --git a/ui/pages/home/index.scss b/ui/pages/home/index.scss
index cee94a943..5b14a79dc 100644
--- a/ui/pages/home/index.scss
+++ b/ui/pages/home/index.scss
@@ -23,7 +23,7 @@
   // TODO: fix style import order so this isn't required to override specificity of `tab` class
   &__main-view &__tabs {
     border: none;
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    padding: 0 16px;
   }
 
   &__main-view &__tab {
@@ -39,7 +39,7 @@
   }
 
   &__main-view &__tab button {
-    padding: 16px 8px;
+    padding: 8px;
   }
 
   &__connect-status-text {

From 74f2d27d10713904b7cf28eaebbbc6f052dd0c5e Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 3 Apr 2023 15:57:39 -0230
Subject: [PATCH 126/129] Update `@metamask/safe-event-emitter` (#18419)

The package `safe-event-emitter` has been updated to v2. This update
includes renaming the package to be scoped under `@metamask`, and it
includes a TypeScript migration.
---
 app/scripts/controllers/transactions/index.js |  2 +-
 .../transactions/pending-tx-tracker.js        |  2 +-
 .../transactions/tx-state-manager.js          |  2 +-
 app/scripts/lib/metaRPCClientFactory.js       |  2 +-
 app/scripts/lib/notification-manager.js       |  2 +-
 lavamoat/browserify/beta/policy.json          | 70 +++++++++----------
 lavamoat/browserify/desktop/policy.json       | 70 +++++++++----------
 lavamoat/browserify/flask/policy.json         | 70 +++++++++----------
 lavamoat/browserify/main/policy.json          | 70 +++++++++----------
 package.json                                  |  2 +-
 yarn.lock                                     |  2 +-
 11 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 8d0cddd6e..c3026e043 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -1,4 +1,4 @@
-import EventEmitter from 'safe-event-emitter';
+import EventEmitter from '@metamask/safe-event-emitter';
 import { ObservableStore } from '@metamask/obs-store';
 import { bufferToHex, keccak, toBuffer, isHexString } from 'ethereumjs-util';
 import EthQuery from 'ethjs-query';
diff --git a/app/scripts/controllers/transactions/pending-tx-tracker.js b/app/scripts/controllers/transactions/pending-tx-tracker.js
index 6252727c3..93b1de252 100644
--- a/app/scripts/controllers/transactions/pending-tx-tracker.js
+++ b/app/scripts/controllers/transactions/pending-tx-tracker.js
@@ -1,4 +1,4 @@
-import EventEmitter from 'safe-event-emitter';
+import EventEmitter from '@metamask/safe-event-emitter';
 import log from 'loglevel';
 import EthQuery from 'ethjs-query';
 import { TransactionStatus } from '../../../../shared/constants/transaction';
diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
index 98d18bca1..20e142c6c 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -1,4 +1,4 @@
-import EventEmitter from 'safe-event-emitter';
+import EventEmitter from '@metamask/safe-event-emitter';
 import { ObservableStore } from '@metamask/obs-store';
 import log from 'loglevel';
 import { values, keyBy, mapValues, omitBy, pickBy, sortBy } from 'lodash';
diff --git a/app/scripts/lib/metaRPCClientFactory.js b/app/scripts/lib/metaRPCClientFactory.js
index c09f7e38d..3aae9962d 100644
--- a/app/scripts/lib/metaRPCClientFactory.js
+++ b/app/scripts/lib/metaRPCClientFactory.js
@@ -1,5 +1,5 @@
 import { EthereumRpcError } from 'eth-rpc-errors';
-import SafeEventEmitter from 'safe-event-emitter';
+import SafeEventEmitter from '@metamask/safe-event-emitter';
 import createRandomId from '../../../shared/modules/random-id';
 import { TEN_SECONDS_IN_MILLISECONDS } from '../../../shared/lib/transactions-controller-utils';
 
diff --git a/app/scripts/lib/notification-manager.js b/app/scripts/lib/notification-manager.js
index 6ee4e3c12..2e4d45ee2 100644
--- a/app/scripts/lib/notification-manager.js
+++ b/app/scripts/lib/notification-manager.js
@@ -1,4 +1,4 @@
-import EventEmitter from 'safe-event-emitter';
+import EventEmitter from '@metamask/safe-event-emitter';
 import ExtensionPlatform from '../platforms/extension';
 
 const NOTIFICATION_HEIGHT = 620;
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index cf463cda4..08574f4a4 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -469,8 +469,8 @@
     "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": {
       "packages": {
         "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": {
@@ -874,10 +874,10 @@
         "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
+        "@metamask/safe-event-emitter": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
         "lavamoat>json-stable-stringify": true,
         "vinyl>clone": true
       }
@@ -912,8 +912,8 @@
     },
     "@metamask/eth-json-rpc-provider": {
       "packages": {
-        "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "json-rpc-engine": true
       }
     },
     "@metamask/eth-keyring-controller": {
@@ -968,7 +968,7 @@
     },
     "@metamask/eth-keyring-controller>obs-store": {
       "packages": {
-        "safe-event-emitter": true,
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
         "watchify>xtend": true
       }
     },
@@ -1056,9 +1056,9 @@
         "@metamask/eth-token-tracker>eth-block-tracker": true,
         "@metamask/eth-token-tracker>ethjs": true,
         "@metamask/eth-token-tracker>human-standard-token-abi": true,
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
         "ethjs-contract": true,
-        "ethjs-query": true,
-        "safe-event-emitter": true
+        "ethjs-query": true
       }
     },
     "@metamask/eth-token-tracker>deep-equal": {
@@ -1090,8 +1090,8 @@
       },
       "packages": {
         "@metamask/eth-token-tracker>eth-block-tracker>pify": true,
-        "eth-query": true,
-        "safe-event-emitter": true
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
+        "eth-query": true
       }
     },
     "@metamask/eth-token-tracker>ethjs": {
@@ -1150,6 +1150,15 @@
         "promise-to-callback": true
       }
     },
+    "@metamask/eth-token-tracker>safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>util": true,
+        "webpack>events": true
+      }
+    },
     "@metamask/etherscan-link": {
       "globals": {
         "URL": true
@@ -1332,8 +1341,8 @@
       },
       "packages": {
         "@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@metamask/obs-store>through2": {
@@ -1455,6 +1464,14 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>events": true
+      }
+    },
     "@metamask/scure-bip39": {
       "globals": {
         "TextEncoder": true
@@ -2726,10 +2743,10 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/safe-event-emitter": true,
         "eth-block-tracker>@metamask/utils": true,
         "eth-block-tracker>pify": true,
-        "eth-query>json-rpc-random-id": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "eth-query>json-rpc-random-id": true
       }
     },
     "eth-block-tracker>@metamask/utils": {
@@ -2772,10 +2789,10 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/safe-event-emitter": true,
         "eth-json-rpc-filters>async-mutex": true,
         "eth-query": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
         "pify": true
       }
     },
@@ -3614,16 +3631,8 @@
     },
     "json-rpc-engine": {
       "packages": {
-        "eth-rpc-errors": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "json-rpc-engine>@metamask/safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>events": true
+        "@metamask/safe-event-emitter": true,
+        "eth-rpc-errors": true
       }
     },
     "json-rpc-middleware-stream": {
@@ -3632,7 +3641,7 @@
         "setTimeout": true
       },
       "packages": {
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "@metamask/safe-event-emitter": true,
         "readable-stream": true
       }
     },
@@ -4211,15 +4220,6 @@
         "@babel/runtime": true
       }
     },
-    "safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>util": true,
-        "webpack>events": true
-      }
-    },
     "semver": {
       "globals": {
         "console.error": true
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index c2acd56f3..f1b1e3a49 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -469,8 +469,8 @@
     "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": {
       "packages": {
         "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": {
@@ -928,10 +928,10 @@
         "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
+        "@metamask/safe-event-emitter": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
         "lavamoat>json-stable-stringify": true,
         "vinyl>clone": true
       }
@@ -966,8 +966,8 @@
     },
     "@metamask/eth-json-rpc-provider": {
       "packages": {
-        "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "json-rpc-engine": true
       }
     },
     "@metamask/eth-keyring-controller": {
@@ -1022,7 +1022,7 @@
     },
     "@metamask/eth-keyring-controller>obs-store": {
       "packages": {
-        "safe-event-emitter": true,
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
         "watchify>xtend": true
       }
     },
@@ -1110,9 +1110,9 @@
         "@metamask/eth-token-tracker>eth-block-tracker": true,
         "@metamask/eth-token-tracker>ethjs": true,
         "@metamask/eth-token-tracker>human-standard-token-abi": true,
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
         "ethjs-contract": true,
-        "ethjs-query": true,
-        "safe-event-emitter": true
+        "ethjs-query": true
       }
     },
     "@metamask/eth-token-tracker>deep-equal": {
@@ -1144,8 +1144,8 @@
       },
       "packages": {
         "@metamask/eth-token-tracker>eth-block-tracker>pify": true,
-        "eth-query": true,
-        "safe-event-emitter": true
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
+        "eth-query": true
       }
     },
     "@metamask/eth-token-tracker>ethjs": {
@@ -1204,6 +1204,15 @@
         "promise-to-callback": true
       }
     },
+    "@metamask/eth-token-tracker>safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>util": true,
+        "webpack>events": true
+      }
+    },
     "@metamask/etherscan-link": {
       "globals": {
         "URL": true
@@ -1398,8 +1407,8 @@
       },
       "packages": {
         "@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@metamask/obs-store>through2": {
@@ -1610,6 +1619,14 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>events": true
+      }
+    },
     "@metamask/scure-bip39": {
       "globals": {
         "TextEncoder": true
@@ -3121,10 +3138,10 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/safe-event-emitter": true,
         "eth-block-tracker>@metamask/utils": true,
         "eth-block-tracker>pify": true,
-        "eth-query>json-rpc-random-id": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "eth-query>json-rpc-random-id": true
       }
     },
     "eth-block-tracker>@metamask/utils": {
@@ -3167,10 +3184,10 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/safe-event-emitter": true,
         "eth-json-rpc-filters>async-mutex": true,
         "eth-query": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
         "pify": true
       }
     },
@@ -4009,16 +4026,8 @@
     },
     "json-rpc-engine": {
       "packages": {
-        "eth-rpc-errors": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "json-rpc-engine>@metamask/safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>events": true
+        "@metamask/safe-event-emitter": true,
+        "eth-rpc-errors": true
       }
     },
     "json-rpc-middleware-stream": {
@@ -4027,7 +4036,7 @@
         "setTimeout": true
       },
       "packages": {
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "@metamask/safe-event-emitter": true,
         "readable-stream": true
       }
     },
@@ -4738,15 +4747,6 @@
         "@babel/runtime": true
       }
     },
-    "safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>util": true,
-        "webpack>events": true
-      }
-    },
     "semver": {
       "globals": {
         "console.error": true
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index c2acd56f3..f1b1e3a49 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -469,8 +469,8 @@
     "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": {
       "packages": {
         "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": {
@@ -928,10 +928,10 @@
         "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
+        "@metamask/safe-event-emitter": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
         "lavamoat>json-stable-stringify": true,
         "vinyl>clone": true
       }
@@ -966,8 +966,8 @@
     },
     "@metamask/eth-json-rpc-provider": {
       "packages": {
-        "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "json-rpc-engine": true
       }
     },
     "@metamask/eth-keyring-controller": {
@@ -1022,7 +1022,7 @@
     },
     "@metamask/eth-keyring-controller>obs-store": {
       "packages": {
-        "safe-event-emitter": true,
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
         "watchify>xtend": true
       }
     },
@@ -1110,9 +1110,9 @@
         "@metamask/eth-token-tracker>eth-block-tracker": true,
         "@metamask/eth-token-tracker>ethjs": true,
         "@metamask/eth-token-tracker>human-standard-token-abi": true,
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
         "ethjs-contract": true,
-        "ethjs-query": true,
-        "safe-event-emitter": true
+        "ethjs-query": true
       }
     },
     "@metamask/eth-token-tracker>deep-equal": {
@@ -1144,8 +1144,8 @@
       },
       "packages": {
         "@metamask/eth-token-tracker>eth-block-tracker>pify": true,
-        "eth-query": true,
-        "safe-event-emitter": true
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
+        "eth-query": true
       }
     },
     "@metamask/eth-token-tracker>ethjs": {
@@ -1204,6 +1204,15 @@
         "promise-to-callback": true
       }
     },
+    "@metamask/eth-token-tracker>safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>util": true,
+        "webpack>events": true
+      }
+    },
     "@metamask/etherscan-link": {
       "globals": {
         "URL": true
@@ -1398,8 +1407,8 @@
       },
       "packages": {
         "@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@metamask/obs-store>through2": {
@@ -1610,6 +1619,14 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>events": true
+      }
+    },
     "@metamask/scure-bip39": {
       "globals": {
         "TextEncoder": true
@@ -3121,10 +3138,10 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/safe-event-emitter": true,
         "eth-block-tracker>@metamask/utils": true,
         "eth-block-tracker>pify": true,
-        "eth-query>json-rpc-random-id": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "eth-query>json-rpc-random-id": true
       }
     },
     "eth-block-tracker>@metamask/utils": {
@@ -3167,10 +3184,10 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/safe-event-emitter": true,
         "eth-json-rpc-filters>async-mutex": true,
         "eth-query": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
         "pify": true
       }
     },
@@ -4009,16 +4026,8 @@
     },
     "json-rpc-engine": {
       "packages": {
-        "eth-rpc-errors": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "json-rpc-engine>@metamask/safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>events": true
+        "@metamask/safe-event-emitter": true,
+        "eth-rpc-errors": true
       }
     },
     "json-rpc-middleware-stream": {
@@ -4027,7 +4036,7 @@
         "setTimeout": true
       },
       "packages": {
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "@metamask/safe-event-emitter": true,
         "readable-stream": true
       }
     },
@@ -4738,15 +4747,6 @@
         "@babel/runtime": true
       }
     },
-    "safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>util": true,
-        "webpack>events": true
-      }
-    },
     "semver": {
       "globals": {
         "console.error": true
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index cf463cda4..08574f4a4 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -469,8 +469,8 @@
     "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": {
       "packages": {
         "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": {
@@ -874,10 +874,10 @@
         "@metamask/eth-json-rpc-infura>@metamask/utils": true,
         "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true,
         "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true,
+        "@metamask/safe-event-emitter": true,
         "browserify>browser-resolve": true,
         "eth-rpc-errors": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
         "lavamoat>json-stable-stringify": true,
         "vinyl>clone": true
       }
@@ -912,8 +912,8 @@
     },
     "@metamask/eth-json-rpc-provider": {
       "packages": {
-        "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "json-rpc-engine": true
       }
     },
     "@metamask/eth-keyring-controller": {
@@ -968,7 +968,7 @@
     },
     "@metamask/eth-keyring-controller>obs-store": {
       "packages": {
-        "safe-event-emitter": true,
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
         "watchify>xtend": true
       }
     },
@@ -1056,9 +1056,9 @@
         "@metamask/eth-token-tracker>eth-block-tracker": true,
         "@metamask/eth-token-tracker>ethjs": true,
         "@metamask/eth-token-tracker>human-standard-token-abi": true,
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
         "ethjs-contract": true,
-        "ethjs-query": true,
-        "safe-event-emitter": true
+        "ethjs-query": true
       }
     },
     "@metamask/eth-token-tracker>deep-equal": {
@@ -1090,8 +1090,8 @@
       },
       "packages": {
         "@metamask/eth-token-tracker>eth-block-tracker>pify": true,
-        "eth-query": true,
-        "safe-event-emitter": true
+        "@metamask/eth-token-tracker>safe-event-emitter": true,
+        "eth-query": true
       }
     },
     "@metamask/eth-token-tracker>ethjs": {
@@ -1150,6 +1150,15 @@
         "promise-to-callback": true
       }
     },
+    "@metamask/eth-token-tracker>safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>util": true,
+        "webpack>events": true
+      }
+    },
     "@metamask/etherscan-link": {
       "globals": {
         "URL": true
@@ -1332,8 +1341,8 @@
       },
       "packages": {
         "@metamask/obs-store>through2": true,
-        "browserify>stream-browserify": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/safe-event-emitter": true,
+        "browserify>stream-browserify": true
       }
     },
     "@metamask/obs-store>through2": {
@@ -1455,6 +1464,14 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/safe-event-emitter": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "browserify>events": true
+      }
+    },
     "@metamask/scure-bip39": {
       "globals": {
         "TextEncoder": true
@@ -2726,10 +2743,10 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/safe-event-emitter": true,
         "eth-block-tracker>@metamask/utils": true,
         "eth-block-tracker>pify": true,
-        "eth-query>json-rpc-random-id": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "eth-query>json-rpc-random-id": true
       }
     },
     "eth-block-tracker>@metamask/utils": {
@@ -2772,10 +2789,10 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/safe-event-emitter": true,
         "eth-json-rpc-filters>async-mutex": true,
         "eth-query": true,
         "json-rpc-engine": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
         "pify": true
       }
     },
@@ -3614,16 +3631,8 @@
     },
     "json-rpc-engine": {
       "packages": {
-        "eth-rpc-errors": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "json-rpc-engine>@metamask/safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>events": true
+        "@metamask/safe-event-emitter": true,
+        "eth-rpc-errors": true
       }
     },
     "json-rpc-middleware-stream": {
@@ -3632,7 +3641,7 @@
         "setTimeout": true
       },
       "packages": {
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "@metamask/safe-event-emitter": true,
         "readable-stream": true
       }
     },
@@ -4211,15 +4220,6 @@
         "@babel/runtime": true
       }
     },
-    "safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>util": true,
-        "webpack>events": true
-      }
-    },
     "semver": {
       "globals": {
         "console.error": true
diff --git a/package.json b/package.json
index b6849a24d..4116e0895 100644
--- a/package.json
+++ b/package.json
@@ -255,6 +255,7 @@
     "@metamask/providers": "^10.2.1",
     "@metamask/rate-limit-controller": "^1.0.0",
     "@metamask/rpc-methods": "^0.32.2",
+    "@metamask/safe-event-emitter": "^2.0.0",
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/slip44": "^2.1.0",
     "@metamask/smart-transactions-controller": "^3.1.0",
@@ -348,7 +349,6 @@
     "redux-thunk": "^2.3.0",
     "remove-trailing-slash": "^0.1.1",
     "reselect": "^3.0.1",
-    "safe-event-emitter": "^1.0.1",
     "ses": "^0.12.4",
     "single-call-balance-checker-abi": "^1.0.0",
     "swappable-obj-proxy": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 5f398c68d..d3962c019 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24297,6 +24297,7 @@ __metadata:
     "@metamask/providers": ^10.2.1
     "@metamask/rate-limit-controller": ^1.0.0
     "@metamask/rpc-methods": ^0.32.2
+    "@metamask/safe-event-emitter": ^2.0.0
     "@metamask/scure-bip39": ^2.0.3
     "@metamask/slip44": ^2.1.0
     "@metamask/smart-transactions-controller": ^3.1.0
@@ -24526,7 +24527,6 @@ __metadata:
     require-from-string: ^2.0.2
     reselect: ^3.0.1
     resolve-url-loader: ^3.1.5
-    safe-event-emitter: ^1.0.1
     sass: ^1.32.4
     sass-loader: ^10.1.1
     selenium-webdriver: ^4.3.1

From be41b2919921bb9baf833b51b39baa80418aa0d7 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 3 Apr 2023 15:58:56 -0230
Subject: [PATCH 127/129] Update `@metamask/obs-store` (#18421)

`@metamask/obs-store` has been updated from v5 to v8. The breaking
changes include updating the minimum supported Node.js version to v12,
and removing an unused class `LocalStorageStore`. v8 includes a bugfix
that resolves an accidental breaking change in v6.0.2; it's non-
breaking when updating from older versions.

This update includes type improvements. The main improvement is that
now we can type the observational store using generic parameters. The
previous version used `unknown` for the store contents.
---
 lavamoat/browserify/beta/policy.json    |  3 ---
 lavamoat/browserify/desktop/policy.json | 23 +++++++++++++++++++----
 lavamoat/browserify/flask/policy.json   | 23 +++++++++++++++++++----
 lavamoat/browserify/main/policy.json    |  3 ---
 package.json                            |  2 +-
 yarn.lock                               | 12 +++++++++++-
 6 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 08574f4a4..98b889720 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1336,9 +1336,6 @@
       }
     },
     "@metamask/obs-store": {
-      "globals": {
-        "localStorage": true
-      },
       "packages": {
         "@metamask/obs-store>through2": true,
         "@metamask/safe-event-emitter": true,
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index f1b1e3a49..167424fd4 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -857,9 +857,9 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/desktop>@metamask/obs-store": true,
         "@metamask/desktop>eciesjs": true,
         "@metamask/desktop>otpauth": true,
-        "@metamask/obs-store": true,
         "browserify>buffer": true,
         "browserify>events": true,
         "browserify>process": true,
@@ -872,6 +872,24 @@
         "webextension-polyfill": true
       }
     },
+    "@metamask/desktop>@metamask/obs-store": {
+      "globals": {
+        "localStorage": true
+      },
+      "packages": {
+        "@metamask/desktop>@metamask/obs-store>through2": true,
+        "browserify>stream-browserify": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/desktop>@metamask/obs-store>through2": {
+      "packages": {
+        "browserify>process": true,
+        "browserify>util": true,
+        "readable-stream": true,
+        "watchify>xtend": true
+      }
+    },
     "@metamask/desktop>eciesjs": {
       "packages": {
         "@metamask/desktop>eciesjs>futoin-hkdf": true,
@@ -1402,9 +1420,6 @@
       }
     },
     "@metamask/obs-store": {
-      "globals": {
-        "localStorage": true
-      },
       "packages": {
         "@metamask/obs-store>through2": true,
         "@metamask/safe-event-emitter": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index f1b1e3a49..167424fd4 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -857,9 +857,9 @@
         "setTimeout": true
       },
       "packages": {
+        "@metamask/desktop>@metamask/obs-store": true,
         "@metamask/desktop>eciesjs": true,
         "@metamask/desktop>otpauth": true,
-        "@metamask/obs-store": true,
         "browserify>buffer": true,
         "browserify>events": true,
         "browserify>process": true,
@@ -872,6 +872,24 @@
         "webextension-polyfill": true
       }
     },
+    "@metamask/desktop>@metamask/obs-store": {
+      "globals": {
+        "localStorage": true
+      },
+      "packages": {
+        "@metamask/desktop>@metamask/obs-store>through2": true,
+        "browserify>stream-browserify": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/desktop>@metamask/obs-store>through2": {
+      "packages": {
+        "browserify>process": true,
+        "browserify>util": true,
+        "readable-stream": true,
+        "watchify>xtend": true
+      }
+    },
     "@metamask/desktop>eciesjs": {
       "packages": {
         "@metamask/desktop>eciesjs>futoin-hkdf": true,
@@ -1402,9 +1420,6 @@
       }
     },
     "@metamask/obs-store": {
-      "globals": {
-        "localStorage": true
-      },
       "packages": {
         "@metamask/obs-store>through2": true,
         "@metamask/safe-event-emitter": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 08574f4a4..98b889720 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1336,9 +1336,6 @@
       }
     },
     "@metamask/obs-store": {
-      "globals": {
-        "localStorage": true
-      },
       "packages": {
         "@metamask/obs-store>through2": true,
         "@metamask/safe-event-emitter": true,
diff --git a/package.json b/package.json
index 4116e0895..d53e20a06 100644
--- a/package.json
+++ b/package.json
@@ -248,7 +248,7 @@
     "@metamask/message-manager": "^2.0.0",
     "@metamask/metamask-eth-abis": "^3.0.0",
     "@metamask/notification-controller": "^1.0.0",
-    "@metamask/obs-store": "^5.0.0",
+    "@metamask/obs-store": "^8.0.0",
     "@metamask/permission-controller": "^3.1.0",
     "@metamask/phishing-controller": "^2.0.0",
     "@metamask/post-message-stream": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index d3962c019..832517322 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4150,6 +4150,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/obs-store@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@metamask/obs-store@npm:8.0.0"
+  dependencies:
+    "@metamask/safe-event-emitter": ^2.0.0
+    through2: ^2.0.3
+  checksum: 232362e65a3563f0bd3299cec48f5adb37e68d4f066b7de90f2b044480d3b16c2d918c12d672c825e1d9b55344ae818fb8494d91129e4613555097653b9bb887
+  languageName: node
+  linkType: hard
+
 "@metamask/permission-controller@npm:^1.0.1":
   version: 1.0.2
   resolution: "@metamask/permission-controller@npm:1.0.2"
@@ -24289,7 +24299,7 @@ __metadata:
     "@metamask/message-manager": ^2.0.0
     "@metamask/metamask-eth-abis": ^3.0.0
     "@metamask/notification-controller": ^1.0.0
-    "@metamask/obs-store": ^5.0.0
+    "@metamask/obs-store": ^8.0.0
     "@metamask/permission-controller": ^3.1.0
     "@metamask/phishing-controller": ^2.0.0
     "@metamask/phishing-warning": ^2.1.0

From 1e079e95b09422f16690a5911c014c79c96338bd Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 3 Apr 2023 12:58:09 -0700
Subject: [PATCH 128/129] Move all validate-source-maps-beta steps in
 config.yml into the respective .sh file (#18427)

---
 .circleci/config.yml                           | 6 ------
 .circleci/scripts/validate-source-maps-beta.sh | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f4f84e8d1..e25e89fa5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1097,12 +1097,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run:
-          name: Move beta build to dist
-          command: mv ./dist-beta ./dist
-      - run:
-          name: Move beta zips to builds
-          command: mv ./builds-beta ./builds
       - run:
           name: Validate source maps
           command: |
diff --git a/.circleci/scripts/validate-source-maps-beta.sh b/.circleci/scripts/validate-source-maps-beta.sh
index 644ac9fa6..186aa1548 100755
--- a/.circleci/scripts/validate-source-maps-beta.sh
+++ b/.circleci/scripts/validate-source-maps-beta.sh
@@ -10,6 +10,8 @@ current_commit_msg=$(git show -s --format='%s' HEAD)
 if [[ $current_commit_msg =~ Version[[:space:]](v[[:digit:]]+.[[:digit:]]+.[[:digit:]]+[-]beta.[[:digit:]]) ]]
 then
     # filter the commit message like Version v10.24.1-beta.1
+	mv ./dist-beta ./dist
+	mv ./builds-beta ./builds
     printf '%s\n' "Validate source maps with beta version $current_commit_msg"
     yarn validate-source-maps
 else

From 4b271868cff84caa898eac5fc9d0b50544d69b91 Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Tue, 4 Apr 2023 11:23:05 +0530
Subject: [PATCH 129/129] Disabled button for Import Tokens Modal when no token
 is selected (#18396)

* disabled button for zero token

* addressed changes
---
 .../detected-token-selection-popover.js                          | 1 +
 1 file changed, 1 insertion(+)

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 4ae5204fc..0f80fea92 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
@@ -63,6 +63,7 @@ const DetectedTokenSelectionPopover = ({
         className="detected-token-selection-popover__import-button"
         type="primary"
         onClick={onImport}
+        disabled={selectedTokens.length === 0}
       >
         {t('importWithCount', [numOfTokensImporting])}
       </Button>